From de358d4bf62d980105c784e6a3b249ed59bb5b69 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 10 Apr 2013 12:10:03 -0700
Subject: [PATCH] fix warnings produced by starfield additions

---
 interface/src/starfield/Controller.h       | 2 +-
 interface/src/starfield/Loader.h           | 4 ++--
 interface/src/starfield/data/InputVertex.h | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/src/starfield/Controller.h b/interface/src/starfield/Controller.h
index b004e73037..edf9fd7ec7 100644
--- a/interface/src/starfield/Controller.h
+++ b/interface/src/starfield/Controller.h
@@ -99,8 +99,8 @@ namespace starfield {
             _valLodOveralloc(1.2),
             _valLodNalloc(0),
             _valLodNrender(0),
-            _valLodBrightness(0),
             _valLodAllocBrightness(0),
+            _valLodBrightness(0),
             _ptrRenderer(0l) {
         }
 
diff --git a/interface/src/starfield/Loader.h b/interface/src/starfield/Loader.h
index 83d63adc2c..bff41409a2 100644
--- a/interface/src/starfield/Loader.h
+++ b/interface/src/starfield/Loader.h
@@ -50,8 +50,8 @@ namespace starfield {
 
                 return false;
             }
- fprintf(stderr, "Stars.cpp: read %d stars, rendering %d\n", 
-      _valRecordsRead, _ptrVertices->size());
+ fprintf(stderr, "Stars.cpp: read %d stars, rendering %ld\n", 
+         _valRecordsRead, _ptrVertices->size());
 
             return true;
         }
diff --git a/interface/src/starfield/data/InputVertex.h b/interface/src/starfield/data/InputVertex.h
index dac242ec51..9f30755325 100644
--- a/interface/src/starfield/data/InputVertex.h
+++ b/interface/src/starfield/data/InputVertex.h
@@ -26,8 +26,8 @@ namespace starfield {
 
         InputVertex(float azimuth, float altitude, unsigned color) {
 
-            _valColor = color >> 16 & 0xffu | color & 0xff00u |
-                    color << 16 & 0xff0000u | 0xff000000u;
+            _valColor = (color >> 16 & 0xffu) | (color & 0xff00u) |
+                        (color << 16 & 0xff0000u) | 0xff000000u;
 
             azimuth = angleConvert<Degrees,Radians>(azimuth);
             altitude = angleConvert<Degrees,Radians>(altitude);