diff options
-rw-r--r-- | extern/libmv/libmv/numeric/numeric.h | 2 | ||||
-rw-r--r-- | extern/libmv/third_party/glog/src/logging.cc | 1 | ||||
-rw-r--r-- | intern/audaspace/intern/AUD_JOSResampleReader.cpp | 2 | ||||
-rw-r--r-- | intern/elbeem/intern/ntl_blenderdumper.cpp | 2 | ||||
-rw-r--r-- | intern/elbeem/intern/particletracer.cpp | 2 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_math_base.h | 8 | ||||
-rw-r--r-- | source/blender/compositor/intern/COM_Node.h | 1 | ||||
-rw-r--r-- | source/blender/freestyle/intern/application/AppConfig.h | 1 | ||||
-rw-r--r-- | source/blender/freestyle/intern/geometry/BBox.h | 1 | ||||
-rw-r--r-- | source/blender/freestyle/intern/stroke/StrokeRenderer.h | 1 | ||||
-rw-r--r-- | source/blender/freestyle/intern/view_map/GridDensityProvider.h | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 1 |
12 files changed, 19 insertions, 4 deletions
diff --git a/extern/libmv/libmv/numeric/numeric.h b/extern/libmv/libmv/numeric/numeric.h index a95723d59cf..81705c4b370 100644 --- a/extern/libmv/libmv/numeric/numeric.h +++ b/extern/libmv/libmv/numeric/numeric.h @@ -44,9 +44,11 @@ inline long lround(double d) { return (long)(d>0 ? d+0.5 : ceil(d-0.5)); } +#if _MSC_VER < 1800 inline int round(double d) { return (d>0) ? int(d+0.5) : int(d-0.5); } +#endif typedef unsigned int uint; #endif // _WIN32 diff --git a/extern/libmv/third_party/glog/src/logging.cc b/extern/libmv/third_party/glog/src/logging.cc index f36e14d2ce4..57d5e24122c 100644 --- a/extern/libmv/third_party/glog/src/logging.cc +++ b/extern/libmv/third_party/glog/src/logging.cc @@ -34,6 +34,7 @@ #include <assert.h> #include <iomanip> #include <string> +#include <algorithm> #ifdef HAVE_UNISTD_H # include <unistd.h> // For _exit. #endif diff --git a/intern/audaspace/intern/AUD_JOSResampleReader.cpp b/intern/audaspace/intern/AUD_JOSResampleReader.cpp index 87577da95cc..0448c75d777 100644 --- a/intern/audaspace/intern/AUD_JOSResampleReader.cpp +++ b/intern/audaspace/intern/AUD_JOSResampleReader.cpp @@ -36,6 +36,7 @@ /* MSVC does not have lrint */ #ifdef _MSC_VER +#if _MSC_VER < 1800 #ifdef _M_X64 #include <emmintrin.h> static inline int lrint(double d) @@ -56,6 +57,7 @@ static inline int lrint(double d) } #endif #endif +#endif // UNUSED // #define CC m_channels + channel diff --git a/intern/elbeem/intern/ntl_blenderdumper.cpp b/intern/elbeem/intern/ntl_blenderdumper.cpp index 4efff4337a6..ec05c25004d 100644 --- a/intern/elbeem/intern/ntl_blenderdumper.cpp +++ b/intern/elbeem/intern/ntl_blenderdumper.cpp @@ -164,7 +164,7 @@ int ntlBlenderDumper::renderScene( void ) boutfilename << ".bobj.gz"; gzf = gzopen(boutfilename.str().c_str(), "wb1"); // wb9 is slow for large meshes! if (!gzf) { - errMsg("ntlBlenderDumper::renderScene","Unable to open output '"<<boutfilename<<"' "); + errMsg("ntlBlenderDumper::renderScene","Unable to open output '" + boutfilename.str() + "' "); return 1; } // dont transform velocity output, this is handled in blender diff --git a/intern/elbeem/intern/particletracer.cpp b/intern/elbeem/intern/particletracer.cpp index 593b582d91f..2f1f5f8efbb 100644 --- a/intern/elbeem/intern/particletracer.cpp +++ b/intern/elbeem/intern/particletracer.cpp @@ -233,7 +233,7 @@ void ParticleTracer::checkDumpTextPositions(double simtime) { if(mDumpTextFile.length()>1) { boutfilename << mDumpTextFile << ".cpart2"; } else { - boutfilename << boutfilename <<"_particles" << ".cpart2"; + boutfilename << "_particles" << ".cpart2"; } debMsgStd("ParticleTracer::checkDumpTextPositions",DM_MSG,"T-Dumping: "<< this->getName() <<", particles:"<<mParts.size()<<" "<< " to "<<boutfilename.str()<<" " , 7); diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index f7e6dc14295..14c1055cd3a 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -144,9 +144,13 @@ static const int NAN_INT = 0x7FC00000; #ifdef WIN32 # ifndef FREE_WINDOWS -# define isnan(n) _isnan(n) +# ifndef isnan +# define isnan(n) _isnan(n) +# endif # define finite _finite -# define hypot _hypot +# ifndef hypot +# define hypot(a, b) _hypot(a, b) +# endif # endif #endif diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h index fb5dfe2e9b7..c14a1973da5 100644 --- a/source/blender/compositor/intern/COM_Node.h +++ b/source/blender/compositor/intern/COM_Node.h @@ -32,6 +32,7 @@ #include "COM_ExecutionSystem.h" #include <vector> #include <string> +#include <algorithm> using namespace std; diff --git a/source/blender/freestyle/intern/application/AppConfig.h b/source/blender/freestyle/intern/application/AppConfig.h index ad64fce2c44..94ae0c3c348 100644 --- a/source/blender/freestyle/intern/application/AppConfig.h +++ b/source/blender/freestyle/intern/application/AppConfig.h @@ -29,6 +29,7 @@ */ #include <string> +#include <algorithm> #include "../system/FreestyleConfig.h" #include "../system/Precision.h" diff --git a/source/blender/freestyle/intern/geometry/BBox.h b/source/blender/freestyle/intern/geometry/BBox.h index c557c2a6368..54fd39800cc 100644 --- a/source/blender/freestyle/intern/geometry/BBox.h +++ b/source/blender/freestyle/intern/geometry/BBox.h @@ -29,6 +29,7 @@ */ #include <stdlib.h> +#include <algorithm> #include "BLI_utildefines.h" diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h index e5478c81b40..90f41a0d0ac 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h @@ -30,6 +30,7 @@ #include <map> #include <string.h> +#include <algorithm> #include <utility> #include <vector> diff --git a/source/blender/freestyle/intern/view_map/GridDensityProvider.h b/source/blender/freestyle/intern/view_map/GridDensityProvider.h index f14362e3deb..272d64dd6de 100644 --- a/source/blender/freestyle/intern/view_map/GridDensityProvider.h +++ b/source/blender/freestyle/intern/view_map/GridDensityProvider.h @@ -29,6 +29,7 @@ */ #include <stdexcept> +#include <algorithm> #include <memory> #include "OccluderSource.h" diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 922c865a0d5..b25a224e16c 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -36,6 +36,7 @@ #include <string> #include <set> #include <errno.h> +#include <algorithm> #include <openexr_api.h> |