Updated TBB (OSX/Win) to 4.2 Update 5, OpenVDB fixes for Windows

Author: betajippity

.gitignore

@@ -1 +1,2 @@
-*.DS_Store
+*.DS_Store
+._*

README.md

@@ -18,7 +18,7 @@ Nuparu currently consists of:
 * [Partio](http://www.disneyanimation.com/technology/partio.html) 1.1.0 (OSX/Win)
 * [RMSD](http://boscoh.com/code/) (OSX/Linux/Win)
 * [OpenEXR](http://www.openexr.com) 2.1.0 (OSX/Win)
-* [TBB](https://www.threadingbuildingblocks.org/) 4.2 Update 4 (OSX/Win)
+* [TBB](https://www.threadingbuildingblocks.org/) 4.2 Update 5 (OSX/Win)
 * [Zlib](http://www.zlib.net/) 1.2.8 (Win)
 * [Boost](www.boost.org) 1.55.0 (OSX/Linux/Win)
 

include/openvdb/io/Compression.h

@@ -278,12 +278,12 @@ readCompressedValues(std::istream& is, ValueT* destBuf, Index destCount,
     const MaskT& valueMask, bool fromHalf)
 {
     // Get the stream's compression settings.
-    const uint32_t compression = getDataCompression(is);
+    const std::uint32_t compression = getDataCompression(is);
     const bool
         zipped = compression & COMPRESS_ZIP,
         maskCompressed = compression & COMPRESS_ACTIVE_MASK;
 
-    int8_t metadata = NO_MASK_AND_ALL_VALS;
+    std::int8_t metadata = NO_MASK_AND_ALL_VALS;
     if (getFormatVersion(is) >= OPENVDB_FILE_VERSION_NODE_MASK_COMPRESSION) {
         // Read the flag that specifies what, if any, additional metadata
         // (selection mask and/or inactive value(s)) is saved.
@@ -389,7 +389,7 @@ writeCompressedValues(std::ostream& os, ValueT* srcBuf, Index srcCount,
     };
 
     // Get the stream's compression settings.
-    const uint32_t compress = getDataCompression(os);
+    const std::uint32_t compress = getDataCompression(os);
     const bool
         zip = compress & COMPRESS_ZIP,
         maskCompress = compress & COMPRESS_ACTIVE_MASK;
@@ -398,7 +398,7 @@ writeCompressedValues(std::ostream& os, ValueT* srcBuf, Index srcCount,
     ValueT* tempBuf = srcBuf;
     boost::scoped_array<ValueT> scopedTempBuf;
 
-    int8_t metadata = NO_MASK_AND_ALL_VALS;
+    std::int8_t metadata = NO_MASK_AND_ALL_VALS;
 
     if (!maskCompress) {
         os.write(reinterpret_cast<const char*>(&metadata), /*bytes=*/1);

include/openvdb/math/Vec3.h

@@ -207,7 +207,7 @@ class Vec3: public Tuple<3, T>
     /// Length of the vector
     T length() const
     {
-        return static_cast<T>(sqrt(double(
+        return static_cast<T>(std::sqrt(double(
             this->mm[0]*this->mm[0] +
             this->mm[1]*this->mm[1] +
             this->mm[2]*this->mm[2])));

include/openvdb/tree/LeafNode.h

@@ -1242,13 +1242,13 @@ LeafNode<T,Log2Dim>::readBuffers(std::istream& is, bool fromHalf)
     // Read in the value mask.
     mValueMask.load(is);
 
-    int8_t numBuffers = 1;
+    std::int8_t numBuffers = 1;
     if (io::getFormatVersion(is) < OPENVDB_FILE_VERSION_NODE_MASK_COMPRESSION) {
         // Read in the origin.
         is.read(reinterpret_cast<char*>(&mOrigin), sizeof(Coord::ValueType) * 3);
 
         // Read in the number of buffers, which should now always be one.
-        is.read(reinterpret_cast<char*>(&numBuffers), sizeof(int8_t));
+        is.read(reinterpret_cast<char*>(&numBuffers), sizeof(std::int8_t));
     }
 
     io::readCompressedValues(is, mBuffer.mData, SIZE, mValueMask, fromHalf);

include/openvdb/tree/Tree.h

@@ -2130,20 +2130,20 @@ Tree<RootNodeType>::print(std::ostream& os, int verboseLevel) const
     os << "  Min value: " << minVal << "\n";
     os << "  Max value: " << maxVal << "\n";
 
-    const uint64_t
+    const std::uint64_t
         leafCount = *nodeCount.rbegin(),
         numActiveVoxels = this->activeVoxelCount(),
         numActiveLeafVoxels = this->activeLeafVoxelCount();
 
     os << "  Number of active voxels:       " << util::formattedInt(numActiveVoxels) << "\n";
 
     Coord dim(0, 0, 0);
-    uint64_t totalVoxels = 0;
+    std::uint64_t totalVoxels = 0;
     if (numActiveVoxels) { // nonempty
         CoordBBox bbox;
         this->evalActiveVoxelBoundingBox(bbox);
         dim = bbox.extents();
-        totalVoxels = dim.x() * uint64_t(dim.y()) * dim.z();
+        totalVoxels = dim.x() * std::uint64_t(dim.y()) * dim.z();
 
         os << "  Bounding box of active voxels: " << bbox << "\n";
         os << "  Dimensions of active voxels:   "
@@ -2165,7 +2165,7 @@ Tree<RootNodeType>::print(std::ostream& os, int verboseLevel) const
     if (verboseLevel == 2) return;
 
     // Memory footprint in bytes
-    const uint64_t
+    const std::uint64_t
         actualMem = this->memUsage(),
         denseMem = sizeof(ValueType) * totalVoxels,
         voxelsMem = sizeof(ValueType) * numActiveLeafVoxels;