Changeset 10771 for code/branches/cpp11_v2/src/external/cpptcl/cpptcl.cc
- Timestamp:
- Nov 7, 2015, 5:24:58 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/external/cpptcl/cpptcl.cc
r8351 r10771 17 17 using namespace Tcl::details; 18 18 using namespace std; 19 // boost::shared_ptr conflicts with the new std::shared_ptr20 //using namespace boost;21 22 19 23 20 result::result(Tcl_Interp *interp) : interp_(interp) {} … … 168 165 169 166 // map of polymorphic callbacks 170 typedef map<string, boost::shared_ptr<callback_base> > callback_interp_map;167 typedef map<string, std::shared_ptr<callback_base> > callback_interp_map; 171 168 typedef map<Tcl_Interp *, callback_interp_map> callback_map; 172 169 … … 181 178 182 179 // map of object handlers 183 typedef map<string, boost::shared_ptr<class_handler_base> > class_interp_map;180 typedef map<string, std::shared_ptr<class_handler_base> > class_interp_map; 184 181 typedef map<Tcl_Interp *, class_interp_map> class_handlers_map; 185 182 … … 492 489 493 490 void class_handler_base::register_method(string const &name, 494 boost::shared_ptr<object_cmd_base> ocb, policies const &p)491 std::shared_ptr<object_cmd_base> ocb, policies const &p) 495 492 { 496 493 methods_[name] = ocb; … … 991 988 992 989 void interpreter::add_function(string const &name, 993 boost::shared_ptr<callback_base> cb, policies const &p)990 std::shared_ptr<callback_base> cb, policies const &p) 994 991 { 995 992 Tcl_CreateObjCommand(interp_, name.c_str(), … … 1001 998 1002 999 void interpreter::add_class(string const &name, 1003 boost::shared_ptr<class_handler_base> chb)1000 std::shared_ptr<class_handler_base> chb) 1004 1001 { 1005 1002 class_handlers[interp_][name] = chb; … … 1007 1004 1008 1005 void interpreter::add_constructor(string const &name, 1009 boost::shared_ptr<class_handler_base> chb, boost::shared_ptr<callback_base> cb,1006 std::shared_ptr<class_handler_base> chb, std::shared_ptr<callback_base> cb, 1010 1007 policies const &p) 1011 1008 {
Note: See TracChangeset
for help on using the changeset viewer.