From dfd04c82919dff816a3005f48f97bb8e174042ff Mon Sep 17 00:00:00 2001
From: Jason Turner <jason@emptycrate.com>
Date: Fri, 29 Jan 2016 15:16:35 -0700
Subject: [PATCH] Clean up formatting from last merge

Closes #238
---
 .../chaiscript/dispatchkit/dispatchkit.hpp    | 40 +++++++++----------
 .../chaiscript/language/chaiscript_engine.hpp | 10 ++---
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/include/chaiscript/dispatchkit/dispatchkit.hpp b/include/chaiscript/dispatchkit/dispatchkit.hpp
index 8edb38c..0aa7db0 100644
--- a/include/chaiscript/dispatchkit/dispatchkit.hpp
+++ b/include/chaiscript/dispatchkit/dispatchkit.hpp
@@ -535,9 +535,9 @@ namespace chaiscript
 
           chaiscript::detail::threading::unique_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
 
-            const auto itr = m_state.m_global_objects.find(name);
-            if (itr == m_state.m_global_objects.end())
-            {
+          const auto itr = m_state.m_global_objects.find(name);
+          if (itr == m_state.m_global_objects.end())
+          {
             m_state.m_global_objects.insert(std::make_pair(name, obj));
             return obj;
           } else {
@@ -549,32 +549,32 @@ namespace chaiscript
         /// Adds a new global (non-const) shared object, between all the threads
         void add_global(const Boxed_Value &obj, const std::string &name)
         {
-            validate_object_name(name);
+          validate_object_name(name);
 
-            chaiscript::detail::threading::unique_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
+          chaiscript::detail::threading::unique_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
 
-            if (m_state.m_global_objects.find(name) != m_state.m_global_objects.end())
-            {
-                throw chaiscript::exception::name_conflict_error(name);
-            } else {
-                m_state.m_global_objects.insert(std::make_pair(name, obj));
-            }
+          if (m_state.m_global_objects.find(name) != m_state.m_global_objects.end())
+          {
+            throw chaiscript::exception::name_conflict_error(name);
+          } else {
+            m_state.m_global_objects.insert(std::make_pair(name, obj));
+          }
         }
 
         /// Updates an existing global shared object or adds a new global shared object if not found
         void set_global(const Boxed_Value &obj, const std::string &name)
         {
-            validate_object_name(name);
+          validate_object_name(name);
 
-            chaiscript::detail::threading::unique_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
+          chaiscript::detail::threading::unique_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
 
-            const auto itr = m_state.m_global_objects.find(name);
-            if (itr != m_state.m_global_objects.end())
-            {
-                itr->second.assign(obj);
-            } else {
-                m_state.m_global_objects.insert(std::make_pair(name, obj));
-            }
+          const auto itr = m_state.m_global_objects.find(name);
+          if (itr != m_state.m_global_objects.end())
+          {
+            itr->second.assign(obj);
+          } else {
+            m_state.m_global_objects.insert(std::make_pair(name, obj));
+          }
         }
 
         /// Adds a new scope to the stack
diff --git a/include/chaiscript/language/chaiscript_engine.hpp b/include/chaiscript/language/chaiscript_engine.hpp
index 16199c3..3e58116 100644
--- a/include/chaiscript/language/chaiscript_engine.hpp
+++ b/include/chaiscript/language/chaiscript_engine.hpp
@@ -622,17 +622,17 @@ namespace chaiscript
     ///          ChaiScript is thread-safe but provides no threading locking mechanism to the script
     ChaiScript &add_global(const Boxed_Value &t_bv, const std::string &t_name)
     {
-        m_engine.add_global(t_bv, t_name);
-        return *this;
+      m_engine.add_global(t_bv, t_name);
+      return *this;
     }
 
     ChaiScript &set_global(const Boxed_Value &t_bv, const std::string &t_name)
     {
-        m_engine.set_global(t_bv, t_name);
-        return *this;
+      m_engine.set_global(t_bv, t_name);
+      return *this;
     }
 
-      /// \brief Represents the current state of the ChaiScript system. State and be saved and restored
+    /// \brief Represents the current state of the ChaiScript system. State and be saved and restored
     /// \warning State object does not contain the user defined type conversions of the engine. They
     ///          are left out due to performance considerations involved in tracking the state
     /// \sa ChaiScript::get_state