[colobot] 262/390: Revert "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 03bb000e827e984eaf40545a80439ea65c595e0e
Author: Tomasz Kapuściński <tomaszkax86 at gmail.com>
Date:   Sat Jan 31 11:55:37 2015 +0100

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

diff --git a/src/common/resources/resourcemanager.cpp b/src/common/resources/resourcemanager.cpp
index 2ec8269..28eebfa 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
         {
-            boost::filesystem3::copy(writeDir + "/" + CleanPath(from), writeDir + "/" + CleanPath(to));
+            fs::copy(writeDir + "/" + CleanPath(from), writeDir + "/" + CleanPath(to));
         }
         catch (std::exception & e)
         {
diff --git a/src/script/scriptfunc.h b/src/script/scriptfunc.h
index 505870a..56d66eb 100644
--- a/src/script/scriptfunc.h
+++ b/src/script/scriptfunc.h
@@ -28,8 +28,6 @@
 
 #include "CBot/CBotDll.h"
 
-#include <string>
-
 
 class CObject;
 class CScript;
@@ -179,4 +177,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