Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 26, 2009, 1:02:22 AM (15 years ago)
Author:
landauf
Message:

fixed some possible namespace issues

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/resource/src/core/TclBind.cc

    r3350 r3353  
    7979            this->interpreter_ = this->createTclInterpreter();
    8080
    81             this->interpreter_->def("orxonox::query", TclBind::tcl_query, Tcl::variadic());
    82             this->interpreter_->def("orxonox::crossquery", TclThreadManager::tcl_crossquery, Tcl::variadic());
     81            this->interpreter_->def("::orxonox::query", TclBind::tcl_query, Tcl::variadic());
     82            this->interpreter_->def("::orxonox::crossquery", TclThreadManager::tcl_crossquery, Tcl::variadic());
    8383            this->interpreter_->def("execute", TclBind::tcl_execute, Tcl::variadic());
    84             this->interpreter_->def("orxonox::crossexecute", TclThreadManager::tcl_crossexecute, Tcl::variadic());
     84            this->interpreter_->def("::orxonox::crossexecute", TclThreadManager::tcl_crossexecute, Tcl::variadic());
    8585
    8686            try
    8787            {
    88                 this->interpreter_->eval("proc query        {args}    { orxonox::query $args }");
    89                 this->interpreter_->eval("proc crossquery   {id args} { orxonox::crossquery 0 $id $args }");
    90                 this->interpreter_->eval("proc crossexecute {id args} { orxonox::crossquery 0 $id $args }");
     88                this->interpreter_->eval("proc query        {args}    { ::orxonox::query $args }");
     89                this->interpreter_->eval("proc crossquery   {id args} { ::orxonox::crossquery 0 $id $args }");
     90                this->interpreter_->eval("proc crossexecute {id args} { ::orxonox::crossquery 0 $id $args }");
    9191                this->interpreter_->eval("proc running      {}        { return 1 }");
    9292                this->interpreter_->eval("set id 0");
    93                 this->interpreter_->eval("rename exit tcl::exit; proc exit {} { execute exit }");
     93                this->interpreter_->eval("rename exit ::tcl::exit; proc exit {} { execute exit }");
    9494            }
    9595            catch (Tcl::tcl_error const &e)
Note: See TracChangeset for help on using the changeset viewer.