Use Application::Exit to implement the exit() script function

diff --git a/lib/base/scriptutils.cpp b/lib/base/scriptutils.cpp
index bc74a5a70adb32ffbe5aa3e0e9c63d7e1a6b9d3e..3cbbd55a7ed2980ea687dcf79a896449ae0848e7 100644 (file)
--- a/lib/base/scriptutils.cpp
+++ b/lib/base/scriptutils.cpp
@@ -25,6 +25,7 @@
 #include "base/logger.hpp"
 #include "base/objectlock.hpp"
 #include "base/dynamictype.hpp"
+#include "base/application.hpp"
 #include <boost/foreach.hpp>
 #include <boost/regex.hpp>
 #include <algorithm>
@@ -39,7 +40,7 @@ REGISTER_SCRIPTFUNCTION(union, &ScriptUtils::Union);
 REGISTER_SCRIPTFUNCTION(intersection, &ScriptUtils::Intersection);
 REGISTER_SCRIPTFUNCTION(log, &ScriptUtils::Log);
 REGISTER_SCRIPTFUNCTION(range, &ScriptUtils::Range);
-REGISTER_SCRIPTFUNCTION(exit, &ScriptUtils::Exit);
+REGISTER_SCRIPTFUNCTION(exit, &Application::Exit);
 REGISTER_SCRIPTFUNCTION(typeof, &ScriptUtils::TypeOf);
 REGISTER_SCRIPTFUNCTION(keys, &ScriptUtils::Keys);
 REGISTER_SCRIPTFUNCTION(random, &Utility::Random);
@@ -179,11 +180,6 @@ Array::Ptr ScriptUtils::Range(const std::vector<Value>& arguments)
        return result;
 }
 
-void ScriptUtils::Exit(int code)
-{
-       exit(code);
-}
-
 Type::Ptr ScriptUtils::TypeOf(const Value& value)
 {
        switch (value.GetType()) {

diff --git a/lib/base/scriptutils.hpp b/lib/base/scriptutils.hpp
index 1a158f8cb91891eb274eb58bf707d89f3758eae8..2dc01c03117d09bbbaceafb52673ecd1dad30ac2 100644 (file)
--- a/lib/base/scriptutils.hpp
+++ b/lib/base/scriptutils.hpp
@@ -42,7 +42,6 @@ public:
        static Array::Ptr Intersection(const std::vector<Value>& arguments);
        static void Log(const std::vector<Value>& arguments);
        static Array::Ptr Range(const std::vector<Value>& arguments);
-       static void Exit(int code);
        static Type::Ptr TypeOf(const Value& value);
        static Array::Ptr Keys(const Dictionary::Ptr& dict);
        static DynamicObject::Ptr GetObject(const String& type, const String& name);