Merge pull request #31 from ThePhD/master

Fixed some bad formatting and a missing include guard

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

sol/table.hpp

@@ -207,7 +207,7 @@ private:
         stack::push(state(), userobjdata);
         luaL_setfuncs(state(), funcreg, upvalues + 1);
 
-       pop();
+        pop();
         return *this;
     }
 
@@ -225,7 +225,7 @@ private:
         push();
         int upvalues = stack::push_user(state(), target);
         luaL_setfuncs(state(), funcreg, upvalues);
-       pop();
+        pop();
 
         return *this;
     }