Index: code/branches/kicklib2/src/external/cpptcl/changes_orxonox.diff
===================================================================
--- code/branches/kicklib2/src/external/cpptcl/changes_orxonox.diff	(revision 8296)
+++ code/branches/kicklib2/src/external/cpptcl/changes_orxonox.diff	(revision 8298)
@@ -1,5 +1,33 @@
---- cpptcl.cc	So Feb  8 23:14:34 2009
-+++ cpptcl.cc	So Feb  8 23:13:07 2009
-@@ -320,7 +320,7 @@
+--- cpptcl.cc	Fri Apr 22 12:18:47 2011
++++ cpptcl.cc	Fri Apr 22 12:20:02 2011
+@@ -16,7 +16,8 @@
+ using namespace Tcl;
+ using namespace Tcl::details;
+ using namespace std;
+-using namespace boost;
++// boost::shared_ptr conflicts with the new std::shared_ptr
++//using namespace boost;
+ 
+ 
+ result::result(Tcl_Interp *interp) : interp_(interp) {}
+@@ -166,7 +167,7 @@
+ {
+ 
+ // map of polymorphic callbacks
+-typedef map<string, shared_ptr<callback_base> > callback_interp_map;
++typedef map<string, boost::shared_ptr<callback_base> > callback_interp_map;
+ typedef map<Tcl_Interp *, callback_interp_map> callback_map;
+ 
+ callback_map callbacks;
+@@ -179,7 +180,7 @@
+ policies_map call_policies;
+ 
+ // map of object handlers
+-typedef map<string, shared_ptr<class_handler_base> > class_interp_map;
++typedef map<string, boost::shared_ptr<class_handler_base> > class_interp_map;
+ typedef map<Tcl_Interp *, class_interp_map> class_handlers_map;
+ 
+ class_handlers_map class_handlers;
+@@ -320,7 +321,7 @@
  
            post_process_policies(interp, pol, objv, false);
@@ -10,5 +38,5 @@
            Tcl_SetResult(interp, const_cast<char*>(e.what()), TCL_VOLATILE);
            return TCL_ERROR;
-@@ -363,7 +363,7 @@
+@@ -363,7 +364,7 @@
  
            post_process_policies(interp, pol, objv, true);
@@ -19,5 +47,5 @@
            Tcl_SetResult(interp, const_cast<char*>(e.what()), TCL_VOLATILE);
            return TCL_ERROR;
-@@ -430,7 +430,7 @@
+@@ -430,7 +431,7 @@
                 Tcl_GetString(Tcl_GetObjResult(interp)),
                 object_handler, static_cast<ClientData>(chb), 0);
@@ -28,2 +56,36 @@
            Tcl_SetResult(interp, const_cast<char*>(e.what()), TCL_VOLATILE);
            return TCL_ERROR;
+@@ -490,7 +491,7 @@
+ }
+ 
+ void class_handler_base::register_method(string const &name,
+-     shared_ptr<object_cmd_base> ocb, policies const &p)
++     boost::shared_ptr<object_cmd_base> ocb, policies const &p)
+ {
+      methods_[name] = ocb;
+      policies_[name] = p;
+@@ -989,7 +990,7 @@
+ }
+ 
+ void interpreter::add_function(string const &name,
+-     shared_ptr<callback_base> cb, policies const &p)
++     boost::shared_ptr<callback_base> cb, policies const &p)
+ {
+      Tcl_CreateObjCommand(interp_, name.c_str(),
+           callback_handler, 0, 0);
+@@ -999,13 +1000,13 @@
+ }
+ 
+ void interpreter::add_class(string const &name,
+-     shared_ptr<class_handler_base> chb)
++     boost::shared_ptr<class_handler_base> chb)
+ {
+      class_handlers[interp_][name] = chb;
+ }
+ 
+ void interpreter::add_constructor(string const &name,
+-     shared_ptr<class_handler_base> chb, shared_ptr<callback_base> cb,
++     boost::shared_ptr<class_handler_base> chb, boost::shared_ptr<callback_base> cb,
+      policies const &p)
+ {
+      Tcl_CreateObjCommand(interp_, name.c_str(),
Index: code/branches/kicklib2/src/external/cpptcl/cpptcl.cc
===================================================================
--- code/branches/kicklib2/src/external/cpptcl/cpptcl.cc	(revision 8296)
+++ code/branches/kicklib2/src/external/cpptcl/cpptcl.cc	(revision 8298)
@@ -17,5 +17,6 @@
 using namespace Tcl::details;
 using namespace std;
-using namespace boost;
+// boost::shared_ptr conflicts with the new std::shared_ptr
+//using namespace boost;
 
 
@@ -167,5 +168,5 @@
 
 // map of polymorphic callbacks
-typedef map<string, shared_ptr<callback_base> > callback_interp_map;
+typedef map<string, boost::shared_ptr<callback_base> > callback_interp_map;
 typedef map<Tcl_Interp *, callback_interp_map> callback_map;
 
@@ -180,5 +181,5 @@
 
 // map of object handlers
-typedef map<string, shared_ptr<class_handler_base> > class_interp_map;
+typedef map<string, boost::shared_ptr<class_handler_base> > class_interp_map;
 typedef map<Tcl_Interp *, class_interp_map> class_handlers_map;
 
@@ -491,5 +492,5 @@
 
 void class_handler_base::register_method(string const &name,
-     shared_ptr<object_cmd_base> ocb, policies const &p)
+     boost::shared_ptr<object_cmd_base> ocb, policies const &p)
 {
      methods_[name] = ocb;
@@ -990,5 +991,5 @@
 
 void interpreter::add_function(string const &name,
-     shared_ptr<callback_base> cb, policies const &p)
+     boost::shared_ptr<callback_base> cb, policies const &p)
 {
      Tcl_CreateObjCommand(interp_, name.c_str(),
@@ -1000,5 +1001,5 @@
 
 void interpreter::add_class(string const &name,
-     shared_ptr<class_handler_base> chb)
+     boost::shared_ptr<class_handler_base> chb)
 {
      class_handlers[interp_][name] = chb;
@@ -1006,5 +1007,5 @@
 
 void interpreter::add_constructor(string const &name,
-     shared_ptr<class_handler_base> chb, shared_ptr<callback_base> cb,
+     boost::shared_ptr<class_handler_base> chb, boost::shared_ptr<callback_base> cb,
      policies const &p)
 {
