From 4ffe164569b2b1d26194cef187403ce76ac14679 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Wed, 8 Aug 2018 08:56:35 -0700
Subject: [PATCH] Address Mac/Linux build warnings

---
 libraries/physics/src/PhysicsEngine.cpp | 4 ++--
 libraries/shared/src/ShapeInfo.cpp      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp
index d55fbf7e34..fe12350124 100644
--- a/libraries/physics/src/PhysicsEngine.cpp
+++ b/libraries/physics/src/PhysicsEngine.cpp
@@ -845,8 +845,8 @@ struct AllContactsCallback : public btCollisionWorld::ContactResultCallback {
         desiredObjectType(desiredObjectType),
         collisionObject(),
         contacts(),
-        btCollisionWorld::ContactResultCallback(),
-        myAvatarCollisionObject(myAvatarCollisionObject) {
+        myAvatarCollisionObject(myAvatarCollisionObject),
+        btCollisionWorld::ContactResultCallback() {
         const btCollisionShape* collisionShape = ObjectMotionState::getShapeManager()->getShape(shapeInfo);
 
         collisionObject.setCollisionShape(const_cast<btCollisionShape*>(collisionShape));
diff --git a/libraries/shared/src/ShapeInfo.cpp b/libraries/shared/src/ShapeInfo.cpp
index 24942c0043..152e305bf2 100644
--- a/libraries/shared/src/ShapeInfo.cpp
+++ b/libraries/shared/src/ShapeInfo.cpp
@@ -75,7 +75,7 @@ QString ShapeInfo::getNameForShapeType(ShapeType type) {
 }
 
 ShapeType ShapeInfo::getShapeTypeForName(QString string) {
-    for (int i = 0; i < SHAPETYPE_NAME_COUNT; i++) {
+    for (int i = 0; i < (int)SHAPETYPE_NAME_COUNT; i++) {
         auto name = shapeTypeNames[i];
         if (name == string) {
             return (ShapeType)i;