Changeset 2641 for code/branches/buildsystem2/src/cpptcl/changes_orxonox.diff

Timestamp:

Feb 8, 2009, 11:52:37 PM (15 years ago)

Author:

rgrieder

Message:

• Update to boost 1.37: System library is now REQUIRED when finding boost even if you have less than boost 1.35. If this is problem, it's going to get quite ugly, but it's possible.
• Fixed a problem in cpptcl.cc: Boost 1.36 introduced boost::exception which conflicted with std::exception (cpptcl makes use of 'using namespace'…)
• Fixed two little bugs for tolua bind files and gcc warnings

File:

• code/branches/buildsystem2/src/cpptcl/changes_orxonox.diff (modified) (1 diff)

code/branches/buildsystem2/src/cpptcl/changes_orxonox.diff

@@ -1 @@
---- cpptcl.cc   Wed Jan 28 20:56:06 2009
-+++ cpptcl.cc   Sat Jan 24 12:52:54 2009
+--- cpptcl.cc   So Feb  8 23:14:34 2009
++++ cpptcl.cc   So Feb  8 23:13:07 2009
+@@ -320,7 +320,7 @@
+ 
+           post_process_policies(interp, pol, objv, false);
+      }
+-     catch (exception const &e)
++     catch (std::exception const &e)
+      {
+           Tcl_SetResult(interp, const_cast<char*>(e.what()), TCL_VOLATILE);
+           return TCL_ERROR;
+@@ -363,7 +363,7 @@
+ 
+           post_process_policies(interp, pol, objv, true);
+      }
+-     catch (exception const &e)
++     catch (std::exception const &e)
+      {
+           Tcl_SetResult(interp, const_cast<char*>(e.what()), TCL_VOLATILE);
+           return TCL_ERROR;
+@@ -430,7 +430,7 @@
+                Tcl_GetString(Tcl_GetObjResult(interp)),
+                object_handler, static_cast<ClientData>(chb), 0);
+      }
+-     catch (exception const &e)
++     catch (std::exception const &e)
+      {
+           Tcl_SetResult(interp, const_cast<char*>(e.what()), TCL_VOLATILE);
+           return TCL_ERROR;
 @@ -858,6 +858,18 @@
       owner_ = true;