Author: cosurgi
Date: 2008-09-20 22:11:27 +0200 (Sat, 20 Sep 2008)
New Revision: 1520

Modified:
   trunk/core/yade.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/SQLiteRecorder.cpp
Log:
make it compile with boost 1.35 (I wonder what 1.36 will bring)


Modified: trunk/core/yade.cpp
===================================================================
--- trunk/core/yade.cpp 2008-09-20 08:47:19 UTC (rev 1519)
+++ trunk/core/yade.cpp 2008-09-20 20:11:27 UTC (rev 1520)
@@ -57,7 +57,7 @@
                if(sig==SIGABRT || sig==SIGSEGV){
                        signal(SIGSEGV,SIG_DFL); signal(SIGABRT,SIG_DFL); // 
prevent loops - default handlers
                        cerr<<"SIGSEGV/SIGABRT handler called; gdb batch file 
is `"<<Omega::instance().gdbCrashBatch<<"'"<<endl;
-                       system((string("gdb -x 
")+Omega::instance().gdbCrashBatch).c_str());
+                       std::system((string("gdb -x 
")+Omega::instance().gdbCrashBatch).c_str());
                        unlink(Omega::instance().gdbCrashBatch.c_str()); // 
delete the crash batch file
                        raise(sig); // reemit signal after exiting gdb
                }

Modified: trunk/pkg/dem/Engine/StandAloneEngine/SQLiteRecorder.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/SQLiteRecorder.cpp    2008-09-20 
08:47:19 UTC (rev 1519)
+++ trunk/pkg/dem/Engine/StandAloneEngine/SQLiteRecorder.cpp    2008-09-20 
20:11:27 UTC (rev 1520)
@@ -3,6 +3,7 @@
 #include<boost/algorithm/string.hpp>
 #include<boost/filesystem/operations.hpp>
 #include<boost/filesystem/convenience.hpp>
+#include<boost/algorithm/string/join.hpp>
 #include<yade/core/MetaBody.hpp>
 using namespace boost;
 CREATE_LOGGER(SQLiteRecorder);


_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp

Reply via email to