Index: code/branches/cpp11_v2/src/external/cpptcl/cpptcl.cc
===================================================================
--- code/branches/cpp11_v2/src/external/cpptcl/cpptcl.cc	(revision 10733)
+++ code/branches/cpp11_v2/src/external/cpptcl/cpptcl.cc	(revision 10771)
@@ -17,7 +17,4 @@
 using namespace Tcl::details;
 using namespace std;
-// boost::shared_ptr conflicts with the new std::shared_ptr
-//using namespace boost;
-
 
 result::result(Tcl_Interp *interp) : interp_(interp) {}
@@ -168,5 +165,5 @@
 
 // map of polymorphic callbacks
-typedef map<string, boost::shared_ptr<callback_base> > callback_interp_map;
+typedef map<string, std::shared_ptr<callback_base> > callback_interp_map;
 typedef map<Tcl_Interp *, callback_interp_map> callback_map;
 
@@ -181,5 +178,5 @@
 
 // map of object handlers
-typedef map<string, boost::shared_ptr<class_handler_base> > class_interp_map;
+typedef map<string, std::shared_ptr<class_handler_base> > class_interp_map;
 typedef map<Tcl_Interp *, class_interp_map> class_handlers_map;
 
@@ -492,5 +489,5 @@
 
 void class_handler_base::register_method(string const &name,
-     boost::shared_ptr<object_cmd_base> ocb, policies const &p)
+     std::shared_ptr<object_cmd_base> ocb, policies const &p)
 {
      methods_[name] = ocb;
@@ -991,5 +988,5 @@
 
 void interpreter::add_function(string const &name,
-     boost::shared_ptr<callback_base> cb, policies const &p)
+     std::shared_ptr<callback_base> cb, policies const &p)
 {
      Tcl_CreateObjCommand(interp_, name.c_str(),
@@ -1001,5 +998,5 @@
 
 void interpreter::add_class(string const &name,
-     boost::shared_ptr<class_handler_base> chb)
+     std::shared_ptr<class_handler_base> chb)
 {
      class_handlers[interp_][name] = chb;
@@ -1007,5 +1004,5 @@
 
 void interpreter::add_constructor(string const &name,
-     boost::shared_ptr<class_handler_base> chb, boost::shared_ptr<callback_base> cb,
+     std::shared_ptr<class_handler_base> chb, std::shared_ptr<callback_base> cb,
      policies const &p)
 {
Index: code/branches/cpp11_v2/src/external/cpptcl/cpptcl.h
===================================================================
--- code/branches/cpp11_v2/src/external/cpptcl/cpptcl.h	(revision 10733)
+++ code/branches/cpp11_v2/src/external/cpptcl/cpptcl.h	(revision 10771)
@@ -17,5 +17,4 @@
 #include <map>
 #include <vector>
-#include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
 
@@ -141,5 +140,5 @@
 
      void register_method(std::string const &name,
-          boost::shared_ptr<object_cmd_base> ocb, policies const &p);
+          std::shared_ptr<object_cmd_base> ocb, policies const &p);
 
      policies & get_policies(std::string const &name);
@@ -148,5 +147,5 @@
      typedef std::map<
           std::string,
-          boost::shared_ptr<object_cmd_base>
+          std::shared_ptr<object_cmd_base>
           > method_map_type;
 
@@ -214,5 +213,5 @@
 {
 public:
-     class_definer(boost::shared_ptr<class_handler<C> > ch) : ch_(ch) {}
+     class_definer(std::shared_ptr<class_handler<C> > ch) : ch_(ch) {}
 
      template <typename R>
@@ -221,5 +220,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method0<C, R>(f)), p);
           return *this;
@@ -231,5 +230,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method0<C, R>(f)), p);
           return *this;
@@ -241,5 +240,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method1<C, R, T1>(f)), p);
           return *this;
@@ -251,5 +250,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method1<C, R, T1>(f)), p);
           return *this;
@@ -261,5 +260,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method2<C, R, T1, T2>(f)), p);
           return *this;
@@ -271,5 +270,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method2<C, R, T1, T2>(f)), p);
           return *this;
@@ -281,5 +280,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method3<C, R, T1, T2, T3>(f)), p);
           return *this;
@@ -291,5 +290,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method3<C, R, T1, T2, T3>(f)), p);
           return *this;
@@ -301,5 +300,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method4<C, R, T1, T2, T3, T4>(f)), p);
           return *this;
@@ -312,5 +311,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method4<C, R, T1, T2, T3, T4>(f)), p);
           return *this;
@@ -323,5 +322,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method5<C, R, T1, T2, T3, T4, T5>(f)), p);
           return *this;
@@ -334,5 +333,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method5<C, R, T1, T2, T3, T4, T5>(f)), p);
           return *this;
@@ -345,5 +344,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method6<C, R, T1, T2, T3, T4, T5, T6>(f)),
                p);
@@ -358,5 +357,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method6<C, R, T1, T2, T3, T4, T5, T6>(f)),
                p);
@@ -371,5 +370,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method7<C, R,
                     T1, T2, T3, T4, T5, T6, T7>(f)), p);
@@ -384,5 +383,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method7<C, R,
                     T1, T2, T3, T4, T5, T6, T7>(f)), p);
@@ -397,5 +396,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method8<C, R,
                     T1, T2, T3, T4, T5, T6, T7, T8>(f)), p);
@@ -410,5 +409,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method8<C, R,
                     T1, T2, T3, T4, T5, T6, T7, T8>(f)), p);
@@ -423,5 +422,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method9<C, R,
                     T1, T2, T3, T4, T5, T6, T7, T8, T9>(f)), p);
@@ -436,5 +435,5 @@
      {
           ch_->register_method(name,
-               boost::shared_ptr<details::object_cmd_base>(
+               std::shared_ptr<details::object_cmd_base>(
                     new details::method9<C, R,
                     T1, T2, T3, T4, T5, T6, T7, T8, T9>(f)), p);
@@ -443,5 +442,5 @@
 
 private:
-     boost::shared_ptr<class_handler<C> > ch_;
+     std::shared_ptr<class_handler<C> > ch_;
 };
 
@@ -482,5 +481,5 @@
      {
           add_function(name,
-               boost::shared_ptr<details::callback_base>(
+               std::shared_ptr<details::callback_base>(
                     new details::callback0<R>(f)), p);
      }
@@ -491,5 +490,5 @@
      {
           add_function(name,
-               boost::shared_ptr<details::callback_base>(
+               std::shared_ptr<details::callback_base>(
                     new details::callback1<R, T1>(f)), p);
      }
@@ -500,5 +499,5 @@
      {
           add_function(name,
-               boost::shared_ptr<details::callback_base>(
+               std::shared_ptr<details::callback_base>(
                     new details::callback2<R, T1, T2>(f)), p);
      }
@@ -509,5 +508,5 @@
      {
           add_function(name,
-               boost::shared_ptr<details::callback_base>(
+               std::shared_ptr<details::callback_base>(
                     new details::callback3<R, T1, T2, T3>(f)), p);
      }
@@ -518,5 +517,5 @@
      {
           add_function(name,
-               boost::shared_ptr<details::callback_base>(
+               std::shared_ptr<details::callback_base>(
                     new details::callback4<R, T1, T2, T3, T4>(f)), p);
      }
@@ -528,5 +527,5 @@
      {
           add_function(name,
-               boost::shared_ptr<details::callback_base>(
+               std::shared_ptr<details::callback_base>(
                     new details::callback5<R, T1, T2, T3, T4, T5>(f)), p);
      }
@@ -538,5 +537,5 @@
      {
           add_function(name,
-               boost::shared_ptr<details::callback_base>(
+               std::shared_ptr<details::callback_base>(
                     new details::callback6<R, T1, T2, T3, T4, T5, T6>(f)), p);
      }
@@ -548,5 +547,5 @@
      {
           add_function(name,
-               boost::shared_ptr<details::callback_base>(
+               std::shared_ptr<details::callback_base>(
                     new details::callback7<R,
                     T1, T2, T3, T4, T5, T6, T7>(f)), p);
@@ -559,5 +558,5 @@
      {
           add_function(name,
-               boost::shared_ptr<details::callback_base>(
+               std::shared_ptr<details::callback_base>(
                     new details::callback8<R,
                     T1, T2, T3, T4, T5, T6, T7, T8>(f)), p);
@@ -572,5 +571,5 @@
      {
           add_function(name,
-               boost::shared_ptr<details::callback_base>(
+               std::shared_ptr<details::callback_base>(
                     new details::callback9<R,
                     T1, T2, T3, T4, T5, T6, T7, T8, T9>(f)), p);
@@ -583,5 +582,5 @@
      details::class_definer<C> class_(std::string const &name)
      {
-          boost::shared_ptr<details::class_handler<C> > ch(
+          std::shared_ptr<details::class_handler<C> > ch(
                new details::class_handler<C>());
 
@@ -589,5 +588,5 @@
 
           add_constructor(name, ch,
-               boost::shared_ptr<details::callback_base>(
+               std::shared_ptr<details::callback_base>(
                     new details::callback0<C*>(&details::construct<
                          C, void, void, void, void, void, void, void,
@@ -608,5 +607,5 @@
                callback_type;
 
-          boost::shared_ptr<details::class_handler<C> > ch(
+          std::shared_ptr<details::class_handler<C> > ch(
                new details::class_handler<C>());
 
@@ -614,5 +613,5 @@
 
           add_constructor(name, ch,
-               boost::shared_ptr<details::callback_base>(
+               std::shared_ptr<details::callback_base>(
                     new callback_type(&details::construct<
                          C, T1, T2, T3, T4, T5, T6, T7, T8, T9>::doit)), p);
@@ -625,5 +624,5 @@
           std::string const &name, details::no_init_type const &)
      {
-          boost::shared_ptr<details::class_handler<C> > ch(
+          std::shared_ptr<details::class_handler<C> > ch(
                new details::class_handler<C>());
 
@@ -660,13 +659,13 @@
 
      void add_function(std::string const &name,
-          boost::shared_ptr<details::callback_base> cb,
+          std::shared_ptr<details::callback_base> cb,
           policies const &p = policies());
 
      void add_class(std::string const &name,
-          boost::shared_ptr<details::class_handler_base> chb);
+          std::shared_ptr<details::class_handler_base> chb);
 
      void add_constructor(std::string const &name,
-          boost::shared_ptr<details::class_handler_base> chb,
-          boost::shared_ptr<details::callback_base> cb,
+          std::shared_ptr<details::class_handler_base> chb,
+          std::shared_ptr<details::callback_base> cb,
           policies const &p = policies());
 
