Merge branch 'develop' into cleanups_and_reworkds

2016-04-11 17:48:31 -06:00
parent b594043eef e57f11fcf4
commit 2a1632f213
9 changed files with 402 additions and 371 deletions
--- a/include/chaiscript/dispatchkit/dispatchkit.hpp
+++ b/include/chaiscript/dispatchkit/dispatchkit.hpp
@@ -178,12 +178,6 @@ namespace chaiscript
        return *this;
      }

-      Module &add(const std::shared_ptr<Module> &m)
-      {
-        m->apply(*this, *this);
-        return *m;
-      }
-
      template<typename Eval, typename Engine>
        void apply(Eval &t_eval, Engine &t_engine) const
        {