Merged changes from SESI for compatibility with C++11 compilers.

Author: OpenVDB-DevTeam

openvdb/CHANGES

@@ -6,8 +6,13 @@ Version 2.2.0 - In development
       GridSampler, DualGridSampler, et al.
     - Modified tools::DualGridSampler so it is more consistent with 
       tools::GridSampler.
-    - Added selection of iso-value to the LevelSetRayIntersector and 
-      openvdb_render.
+    - Added an option to the LevelSetRayIntersector and to vdb_render
+      to specify the isovalue of the level set.
+    - Added methods to the LevelSetRayIntersector to return the time of
+      intersection along a world or index ray.
+    - tools::cpt(), tools::curl(), tools::laplacian(), tools::meanCurvature()
+      and tools::normalize() now output grids with appropriate vector types
+      (covariant, contravariant, etc.).
     - Added a Grid::topologyDifference() method.
     - Added topology union, intersection and difference operations to
       the Combine SOP.  These operations combine the active voxel topologies
@@ -17,7 +22,19 @@ Version 2.2.0 - In development
     - The Fill SOP now allows the fill region bounds to be specified either in
       index space (as before), in world space, or using the bounds of geometry
       connected to an optional new reference input.
+    - Added an option to the Transform SOP to apply the transform to the
+      voxel values of vector-valued grids, in accordance with those grids'
+      Vector Type metadata settings.
+    - Added toggle to specify offet in the "Offset Level Set" SOP in world or 
+      voxel units.
+    - Added a Vector Type menu to the Vector Merge SOP.
+    - Removed the masking options in the Renormalize SOP (since it's not 
+      supported yet).
+    - Fixed a bug in the mean curvature computation that could produce a nan
+      in regions with constant values.
     - Fixed build issue reported for Clang 3.2.
+    - Made various changes for compatibility with C++11 compilers.
+      [Contributed by SESI]
 
     API changes:
     - tools::DualGridSampler is no longer templated on the target grid type,

openvdb/Grid.h

@@ -417,7 +417,7 @@ typedef boost::shared_ptr<GridCPtrSet>  GridCPtrSetPtr;
 /// @brief Predicate functor that returns @c true for grids that have a specified name
 struct OPENVDB_API GridNamePred
 {
-    GridNamePred(const Name& name): name(name) {}
+    GridNamePred(const Name& _name): name(_name) {}
     bool operator()(const GridBase::ConstPtr& g) const { return g && g->getName() == name; }
     Name name;
 };

openvdb/Platform.h

@@ -55,6 +55,24 @@
     #define OPENVDB_CHECK_GCC(MAJOR, MINOR) 0
 #endif
 
+/// Macro for determining if there are sufficient C++0x/C++11 features
+#ifdef __INTEL_COMPILER
+    #ifdef __INTEL_CXX11_MODE__
+        #define OPENVDB_HAS_CXX11 1
+    #endif
+#elif defined(__GXX_EXPERIMENTAL_CXX0X__) || (__cplusplus > 199711L)
+    #define OPENVDB_HAS_CXX11 1
+#elif defined(_MSC_VER)
+    #if (_MSC_VER >= 1700)
+        #define OPENVDB_HAS_CXX11 1
+    #endif
+#endif
+#if defined(__GNUC__) && !OPENVDB_CHECK_GCC(4, 4)
+    // ICC uses GCC's standard library headers, so even if the ICC version
+    // is recent enough for C++11, the GCC version might not be.
+    #undef OPENVDB_HAS_CXX11
+#endif
+
 /// For compilers that need templated function specializations to have
 /// storage qualifiers, we need to declare the specializations as static inline.
 /// Otherwise, we'll get linker errors about multiply defined symbols.

openvdb/Types.h

@@ -306,7 +306,7 @@ class CombineArgs
 template<typename ValueType, typename CombineOp>
 struct SwappedCombineOp
 {
-    SwappedCombineOp(CombineOp& op): op(op) {}
+    SwappedCombineOp(CombineOp& _op): op(_op) {}
 
     void operator()(CombineArgs<ValueType>& args)
     {

openvdb/doc/changes.txt

@@ -12,9 +12,18 @@
   @vdblink::tools::DualGridSampler DualGridSampler@endlink, et al.
 - Modified @vdblink::tools::DualGridSampler DualGridSampler@endlink so 
   it is more consistent with @vdblink::tools::GridSampler GridSampler@endlink.
-- Added selection of iso-value to the 
+- Added an option to the
   @vdblink::tools::LevelSetRayIntersector LevelSetRayIntersector@endlink 
-  and openvdb_render.
+  and to @c vdb_render to specify the isovalue of the level set.
+- Added methods to the 
+  @vdblink::tools::LevelSetRayIntersector LevelSetRayIntersector@endlink 
+  to return the time of intersection along a world or index ray.
+- The @vdblink::tools::cpt() cpt@endlink, @vdblink::tools::curl() curl@endlink,
+  @vdblink::tools::laplacian() laplacian@endlink,
+  @vdblink::tools::meanCurvature() meanCurvature@endlink
+  and @vdblink::tools::normalize() normalize@endlink tools now output grids
+  with appropriate @vdblink::VecType vector types@endlink
+  (covariant, contravariant, etc.).
 - Added a
   @vdblink::Grid::topologyDifference() Grid::topologyDifference@endlink method.
 - Added topology union, intersection and difference operations to
@@ -25,7 +34,18 @@
 - The Fill SOP now allows the fill region bounds to be specified either in
   index space (as before), in world space, or using the bounds of geometry
   connected to an optional new reference input.
+- Added an option to the Transform SOP to apply the transform to the voxel
+  values of vector-valued grids, in accordance with those grids’
+  Vector Type metadata settings.
+- Added toggle to specify offet in the "Offset Level Set" SOP in world or voxel units.
+- Added a Vector Type menu to the Vector Merge SOP.
+- Removed the masking options in the Renormalize SOP (since it's not supported 
+  yet).
+- Fixed a bug in the mean curvature computation that could produce a nan
+  in regions with constant values.
 - Fixed build issue reported for Clang 3.2.
+- Made various changes for compatibility with C++11 compilers.
+  <I>[Contributed by SESI]</I>
 
 @par
 API changes:

openvdb/math/Mat4.h

@@ -75,9 +75,7 @@ class Mat4: public Mat<4, T>
     template<typename Source>
     Mat4(Source *a)
     {
-        register int i;
-
-        for (i = 0; i < 16; i++) {
+        for (int i = 0; i < 16; i++) {
             MyBase::mm[i] = a[i];
         }
     }