Merge branch 'master' into 2011-09-09-CxScript

2012-05-19 18:05:58 -06:00
parent 16bdfe4571 56757973b6
commit ba9d13bf7b
2 changed files with 4 additions and 2 deletions
--- a/include/chaiscript/dispatchkit/dispatchkit.hpp
+++ b/include/chaiscript/dispatchkit/dispatchkit.hpp
@@ -415,7 +415,6 @@ namespace chaiscript
         * Set the value of an object, by name. If the object
         * is not available in the current scope it is created
         */
-        /*
        void add(const Boxed_Value &obj, const std::string &name)
        {
          validate_object_name(name);
@@ -433,7 +432,7 @@ namespace chaiscript

          add_object(name, obj);
        }
-        */
+        

        /**
         * Adds a named object to the current scope