[colobot] 261/390: Potential fix to Travis build fails

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit ed0e5dfef5294e96e6a1ff16a5589df7d5fecbcc
Author: Tomasz Kapuściński <tomaszkax86 at gmail.com>
Date:   Fri Jan 30 22:13:07 2015 +0100

    Potential fix to Travis build fails
---
 src/common/resources/resourcemanager.cpp | 2 +-
 src/script/scriptfunc.h                  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/common/resources/resourcemanager.cpp b/src/common/resources/resourcemanager.cpp
index 28eebfa..2ec8269 100644
--- a/src/common/resources/resourcemanager.cpp
+++ b/src/common/resources/resourcemanager.cpp
@@ -292,7 +292,7 @@ bool CResourceManager::Copy(const std::string& from, const std::string& to)
         std::string writeDir = PHYSFS_getWriteDir();
         try
         {
-            fs::copy(writeDir + "/" + CleanPath(from), writeDir + "/" + CleanPath(to));
+            boost::filesystem3::copy(writeDir + "/" + CleanPath(from), writeDir + "/" + CleanPath(to));
         }
         catch (std::exception & e)
         {
diff --git a/src/script/scriptfunc.h b/src/script/scriptfunc.h
index 56d66eb..505870a 100644
--- a/src/script/scriptfunc.h
+++ b/src/script/scriptfunc.h
@@ -28,6 +28,8 @@
 
 #include "CBot/CBotDll.h"
 
+#include <string>
+
 
 class CObject;
 class CScript;
@@ -177,4 +179,4 @@ private:
     static bool     Process(CScript* script, CBotVar* result, int &exception);
     static bool     ShouldProcessStop(Error err, int errMode);
     static CObject* SearchInfo(CScript* script, CObject* object, float power);
-};
\ No newline at end of file
+};

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git