Merge pull request #31 from ThePhD/master

Fixed some bad formatting and a missing include guard
Rapptz · May 31, 2014 · 072a880 · 072a880
2 parents be3d0ac + 9c7e5f0
commit 072a880
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/sol/proxy.hpp b/sol/proxy.hpp
@@ -19,6 +19,9 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#ifndef SOL_PROXY_HPP
+#define SOL_PROXY_HPP
+
 #include "traits.hpp"
 #include "object.hpp"
 #include "function.hpp"
@@ -127,3 +130,5 @@ inline bool operator!= (const proxy<Table, Key>& right, T&& left) {
 }
 
 } // sol
+
+#endif // SOL_PROXY_HPP
diff --git a/sol/table.hpp b/sol/table.hpp
@@ -207,7 +207,7 @@ class table : public reference {
         stack::push(state(), userobjdata);
         luaL_setfuncs(state(), funcreg, upvalues + 1);
 
-       pop();
+        pop();
         return *this;
     }
 
@@ -225,7 +225,7 @@ class table : public reference {
         push();
         int upvalues = stack::push_user(state(), target);
         luaL_setfuncs(state(), funcreg, upvalues);
-       pop();
+        pop();
 
         return *this;
     }