Skip to content

GitLab

Commit 3a80b0f1 authored by peastman's avatar peastman
Browse files

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

Fixes vs2013 warnings 4251, 4267 in lepton.
parents 83ed602e de927414
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
libraries/lepton/include/lepton/windowsIncludes.h
View file @ 3a80b0f1
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
#ifdef _MSC_VER #ifdef _MSC_VER
// We don't want to hear about how sprintf is "unsafe". // We don't want to hear about how sprintf is "unsafe".
#pragma warning(disable:4996) #pragma warning(disable:4996)
#if defined(LEPTON_BUILDING_SHARED_LIBRARY)
#define LEPTON_EXPORT __declspec(dllexport)
// Keep MS VC++ quiet about lack of dll export of private members. // Keep MS VC++ quiet about lack of dll export of private members.
#pragma warning(disable:4251) #pragma warning(disable:4251)
#if defined(LEPTON_BUILDING_SHARED_LIBRARY)
#define LEPTON_EXPORT __declspec(dllexport)
#elif defined(LEPTON_BUILDING_STATIC_LIBRARY) || defined(LEPTON_USE_STATIC_LIBRARIES) #elif defined(LEPTON_BUILDING_STATIC_LIBRARY) || defined(LEPTON_USE_STATIC_LIBRARIES)
#define LEPTON_EXPORT #define LEPTON_EXPORT
#else #else
......
libraries/lepton/src/CompiledExpression.cpp
View file @ 3a80b0f1
...@@ -121,7 +121,7 @@ void CompiledExpression::compileExpression(const ExpressionTreeNode& node, vecto ...@@ -121,7 +121,7 @@ void CompiledExpression::compileExpression(const ExpressionTreeNode& node, vecto
arguments[stepIndex] = args; 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); workspace.push_back(0.0);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment