Fixes for Linux/GCC.

Between Linux, Darwin and Windows keeping me honest, I am slowly learning C++.
facebookincubator · Nov 6, 2017 · d2a20ee · d2a20ee
1 parent 5eb3779
commit d2a20ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Raw2Gltf.cpp b/src/Raw2Gltf.cpp
@@ -537,7 +537,7 @@ ModelData *Raw2Gltf(
                 int triangleCount = surfaceModel.GetTriangleCount();
 
                 // initialize Draco mesh with vertex index information
-                auto dracoMesh { std::make_shared<draco::Mesh>() };
+                auto dracoMesh(std::make_shared<draco::Mesh>());
                 dracoMesh->SetNumFaces(static_cast<size_t>(triangleCount));
 
                 for (uint32_t ii = 0; ii < triangleCount; ii++) {

diff --git a/src/glTF/PrimitiveData.cpp b/src/glTF/PrimitiveData.cpp
@@ -41,11 +41,11 @@ void PrimitiveData::NoteDracoBuffer(const BufferViewData &data)
 
 void PrimitiveData::AddTarget(const AccessorData *positions, const AccessorData *normals, const AccessorData *tangents)
 {
-    targetAccessors.push_back({
+    targetAccessors.push_back(std::make_tuple(
         positions->ix,
         normals ? normals->ix : -1,
         tangents ? tangents ->ix : -1
-    });
+    ));
 }
 
 void to_json(json &j, const PrimitiveData &d) {