← Back to branch summary

~ubuntu-branches/ubuntu/trusty/plee-the-bear/trusty-proposed

« back to all changes in this revision

Viewing changes to bear-engine/core/src/engine/code/resource_pool.cpp

  • Committer: Package Import Robot
  • Author(s): Vincent Cheng, Evgeni Golov, Gonéri Le Bouder, Julien Jorge, Vincent Cheng
  • Date: 2014-01-23 13:20:52 UTC
  • mfrom: (6.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20140123132052-r0kg74mh6egto11t
Tags: 0.6.0-2
http://bugs.debian.org/720819
http://bugs.debian.org/726176
http://bugs.debian.org/726853
* Team upload.

[ Evgeni Golov ]
* Correct Vcs-* URLs to point to anonscm.debian.org

[ Gonéri Le Bouder ]
* import patches by Julien Jorge to fix a FTBFS  with the current
  Boost.FileSystem (closes: #720819)
* Add myself in Uploaders
* Indent the B-D

[ Julien Jorge ]
* Add mipsn32el mips64 mips64el in the architecures (closes: #726176)
* Add a patch to use the full path to the icon in the menu files
  (closes: #726853)

[ Vincent Cheng ]
* Refresh patches.
* Update to Standards version 3.9.5.
* Update to source format "3.0 (quilt)".

Show diffs side-by-side

added added

removed removed

Lines of Context:
bear-engine/core/src/engine/code/resource_pool.cpp
131
131
 
132
132
  for (it=m_path.begin(); (it!=m_path.end()) && !result; ++it)
133
133
    {
134
 
#if BOOST_VERSION / 100 % 1000 < 34
135
 
      const std::string filepath = *it + '/' + name;
136
 
#else
137
 
      const std::string filepath =
138
 
        *it + boost::filesystem::slash<boost::filesystem::path>::value + name;
139
 
#endif
140
 
      const boost::filesystem::path path( filepath, boost::filesystem::native );
 
134
      const boost::filesystem::path path( boost::filesystem::path(*it) / name );
141
135
 
142
136
      if ( boost::filesystem::exists( path ) )
143
137
        if ( !boost::filesystem::is_directory( path ) )
144
138
          {
145
139
            result = true;
146
 
            name = filepath;
 
140
            name = path.string();
147
141
          }
148
142
    }
149
143