[Bf-blender-cvs] [0a112ef] master: Fix for building with MSVC2008
Campbell Barton
noreply at git.blender.org
Wed Apr 2 00:31:19 CEST 2014
Commit: 0a112efcf7269f8d50587ab1056d871ef2c0f747
Author: Campbell Barton
Date: Wed Apr 2 09:16:47 2014 +1100
https://developer.blender.org/rB0a112efcf7269f8d50587ab1056d871ef2c0f747
Fix for building with MSVC2008
===================================================================
M source/blender/freestyle/intern/view_map/BoxGrid.h
M source/blender/freestyle/intern/view_map/SphericalGrid.h
M source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
===================================================================
diff --git a/source/blender/freestyle/intern/view_map/BoxGrid.h b/source/blender/freestyle/intern/view_map/BoxGrid.h
index a03924c..0ef4ce3 100644
--- a/source/blender/freestyle/intern/view_map/BoxGrid.h
+++ b/source/blender/freestyle/intern/view_map/BoxGrid.h
@@ -28,7 +28,7 @@
* \date 2011-1-29
*/
-#define BOX_GRID_LOGGING false
+#define BOX_GRID_LOGGING 0
// I would like to avoid using deque because including ViewMap.h and <deque> or <vector>
// separately results in redefinitions of identifiers. ViewMap.h already includes <vector>
diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.h b/source/blender/freestyle/intern/view_map/SphericalGrid.h
index 915398a..5a94a84 100644
--- a/source/blender/freestyle/intern/view_map/SphericalGrid.h
+++ b/source/blender/freestyle/intern/view_map/SphericalGrid.h
@@ -28,7 +28,7 @@
* \date 2010-12-19
*/
-#define SPHERICAL_GRID_LOGGING false
+#define SPHERICAL_GRID_LOGGING 0
// I would like to avoid using deque because including ViewMap.h and <deque> or <vector> separately results in
// redefinitions of identifiers. ViewMap.h already includes <vector> so it should be a safe fall-back.
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
index 85c460a..691c7a4 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
@@ -51,7 +51,7 @@ namespace Freestyle {
// XXX Grmll... G is used as template's typename parameter :/
static const Global &_global = G;
-#define LOGGING false
+#define LOGGING 0
using namespace std;
More information about the Bf-blender-cvs
mailing list