From 6694ef3869f9ef9cc664d76170dbf3f1be912ce0 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 10 Jul 2013 16:33:27 -0700
Subject: [PATCH] fixed some compiler warnings

---
 interface/src/Util.cpp               | 3 ++-
 libraries/voxels/src/CoverageMap.cpp | 2 +-
 libraries/voxels/src/Tags.cpp        | 4 ++--
 libraries/voxels/src/ViewFrustum.cpp | 2 +-
 voxel-server/src/main.cpp            | 2 --
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp
index d9813a231f..8d22570275 100644
--- a/interface/src/Util.cpp
+++ b/interface/src/Util.cpp
@@ -501,12 +501,13 @@ void runTimingTests() {
     printLog("powf(f, 0.5) usecs: %f\n", 1000.0f * elapsedMsecs / (float) numTests);
 
     //  Vector Math
+    float distance;
     glm::vec3 pointA(randVector()), pointB(randVector());
     gettimeofday(&startTime, NULL);
     for (int i = 1; i < numTests; i++) {
         //glm::vec3 temp = pointA - pointB;
         //float distanceSquared = glm::dot(temp, temp);
-        float distance = glm::distance(pointA, pointB);
+        distance = glm::distance(pointA, pointB);
     }
     gettimeofday(&endTime, NULL);
     elapsedMsecs = diffclock(&startTime, &endTime);
diff --git a/libraries/voxels/src/CoverageMap.cpp b/libraries/voxels/src/CoverageMap.cpp
index 230df4db69..c1c53ca750 100644
--- a/libraries/voxels/src/CoverageMap.cpp
+++ b/libraries/voxels/src/CoverageMap.cpp
@@ -336,7 +336,7 @@ void CoverageRegion::erase() {
         //    _polygons[i]->getBoundingBox().printDebugDetails();
         //}
     }
-/**/
+**/
     // If we're in charge of managing the polygons, then clean them up first
     if (_managePolygons) {
         for (int i = 0; i < _polygonCount; i++) {
diff --git a/libraries/voxels/src/Tags.cpp b/libraries/voxels/src/Tags.cpp
index 0cbfa1a37c..8f7dab5390 100644
--- a/libraries/voxels/src/Tags.cpp
+++ b/libraries/voxels/src/Tags.cpp
@@ -115,8 +115,8 @@ TagCompound::TagCompound(std::stringstream &ss) :
     _width(0),
     _length(0),
     _height(0),
-    _blocksId(NULL),
-    _blocksData(NULL)
+    _blocksData(NULL),
+    _blocksId(NULL)
 {
     int tagId;
 
diff --git a/libraries/voxels/src/ViewFrustum.cpp b/libraries/voxels/src/ViewFrustum.cpp
index 0245bdc0c1..166a2f2126 100644
--- a/libraries/voxels/src/ViewFrustum.cpp
+++ b/libraries/voxels/src/ViewFrustum.cpp
@@ -583,7 +583,7 @@ VoxelProjectedPolygon ViewFrustum::getProjectedPolygon(const AABox& box) const {
             
             lookUp += PROJECTION_CLIPPED;
         }
-        /***/
+        ***/
     }
     // set the distance from our camera position, to the closest vertex
     float distance = glm::distance(getPosition(), box.getCenter());
diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp
index a7d662fdeb..a5234bcd94 100644
--- a/voxel-server/src/main.cpp
+++ b/voxel-server/src/main.cpp
@@ -995,8 +995,6 @@ void scanTreeWithOcclusion(VoxelTree* tree, ViewFrustum* viewFrustum, CoverageMa
     }
 
     //tree->recurseTreeWithOperationDistanceSorted(scanTreeWithOcclusionOperation, position, (void*)&args);
-    long long now = usecTimestampNow();
-
 
     printf("scanTreeWithOcclusion()\n");
     printf("    position=(%f,%f)\n", position.x, position.y);