Merge pull request #799 from chrisdembia/vs2013-lepton-warnings

Fixes vs2013 warnings 4251, 4267 in lepton.

libraries/lepton/include/lepton/windowsIncludes.h

@@ -25,14 +25,14 @@
 #ifdef _MSC_VER
     // We don't want to hear about how sprintf is "unsafe".
     #pragma warning(disable:4996)
+    // Keep MS VC++ quiet about lack of dll export of private members.
+    #pragma warning(disable:4251)
     #if defined(LEPTON_BUILDING_SHARED_LIBRARY)
         #define LEPTON_EXPORT __declspec(dllexport)
-        // Keep MS VC++ quiet about lack of dll export of private members.
-        #pragma warning(disable:4251)
     #elif defined(LEPTON_BUILDING_STATIC_LIBRARY) || defined(LEPTON_USE_STATIC_LIBRARIES)
-		#define LEPTON_EXPORT
+        #define LEPTON_EXPORT
     #else
-		#define LEPTON_EXPORT __declspec(dllimport)   // i.e., a client of a shared library
+        #define LEPTON_EXPORT __declspec(dllimport)   // i.e., a client of a shared library
     #endif
 #else
     #define LEPTON_EXPORT // Linux, Mac

libraries/lepton/src/CompiledExpression.cpp

@@ -121,7 +121,7 @@ void CompiledExpression::compileExpression(const ExpressionTreeNode& node, vecto
                 arguments[stepIndex] = args;
         }
     }
-    temps.push_back(make_pair(node, workspace.size()));
+    temps.push_back(make_pair(node, (int) workspace.size()));
     workspace.push_back(0.0);
 }
 
@@ -368,4 +368,4 @@ void CompiledExpression::generateSingleArgCall(X86Compiler& c, X86XmmVar& dest,
     call->setArg(0, arg);
     call->setRet(0, dest);
 }
-#endif
\ No newline at end of file
+#endif