Add gcc6 to the test matrix and fix resulting warnings. (#647)

Author: lgritz

.travis.yml

@@ -27,6 +27,8 @@ addons:
       - g++-4.8
       - gcc-5
       - g++-5
+      - gcc-6
+      - g++-6
       - libboost1.55-all-dev
       - libtiff4-dev
       - llvm-3.4-dev
@@ -124,20 +126,20 @@ matrix:
       - os: osx
         compiler: clang
         env: OIIOBRANCH=release USE_CPP11=1
-    # Temporary: try head of RB-1.6
+    # Linux only: test gcc 6 (catch new warnings hot off the presses) and
+    # also use a higher SIMD level, avx and f16c, to make sure all is well.
+    # TravisCI's OSX images don't yet support avx/f16c, so we only do this
+    # on Linux for now, but eventually we'll want to separate these concerns
+    # into separate tests.
       - os: linux
         dist: trusty
         compiler: gcc
-        env: OIIOBRANCH=RB-1.6 USE_CPP11=1
-    # Linux only: test gcc 5 (sometimes it has new warnings that weren't
-    # issues for gcc 4.x or clang) and also use a higher SIMD level, avx and
-    # f16c, to make sure all is well. TravisCI's OSX images don't yet
-    # support avx/f16c, so we only do this on Linux for now, but eventually
-    # we'll want to separate these concerns into separate tests.
+        env: WHICHGCC=6 USE_SIMD=avx,f16c
+    # Linux only: test gcc 5
       - os: linux
         dist: trusty
         compiler: gcc
-        env: WHICHGCC=5 USE_SIMD=avx,f16c
+        env: WHICHGCC=5
     # One more, just for the heck of it, turn all SIMD off.  I guess this
     # should/could be both platforms, but in the interest of making the
     # tests go faster, don't bother doing it on OSX.

src/liboslexec/dictionary.cpp

@@ -455,9 +455,6 @@ ShadingContext::free_dict_resources ()
 }
 
 
-#define USTR(cstr) (*((ustring *)&cstr))
-#define TYPEDESC(x) (*(TypeDesc *)&x)
-
 
 OSL_SHADEOP int osl_dict_find_iis (void *sg_, int nodeID, void *query)
 {

src/liboslexec/llvm_ops.cpp

@@ -138,7 +138,6 @@ void * __dso_handle = 0; // necessary to avoid linkage issues in bitcode
 #define DVEC(x) (*(Dual2<Vec3> *)x)
 #define COL(x) (*(Color3 *)x)
 #define DCOL(x) (*(Dual2<Color3> *)x)
-#define TYPEDESC(x) (*(TypeDesc *)&x)
 
 
 #ifndef OSL_SHADEOP
@@ -823,5 +822,3 @@ OSL_SHADEOP int osl_raytype_bit (void *sg_, int bit)
     ShaderGlobals *sg = (ShaderGlobals *)sg_;
     return (sg->raytype & bit) != 0;
 }
-
-

src/liboslexec/opmessage.cpp

@@ -50,15 +50,13 @@ OSL_NAMESPACE_ENTER
 namespace pvt {
 
 
-#define USTR(cstr) (*((ustring *)&cstr))
-
 OSL_SHADEOP void
 osl_setmessage (ShaderGlobals *sg, const char *name_, long long type_, void *val, int layeridx, const char* sourcefile_, int sourceline)
 {
     const ustring &name (USTR(name_));
     const ustring &sourcefile (USTR(sourcefile_));
     // recreate TypeDesc -- we just crammed it into an int!
-    TypeDesc type (*(TypeDesc *)&type_);
+    TypeDesc type = TYPEDESC(type_);
     bool is_closure = (type.basetype == TypeDesc::UNKNOWN); // secret code for closure
     if (is_closure)
         type.basetype = TypeDesc::PTR;  // for closures, we store a pointer
@@ -105,7 +103,7 @@ osl_getmessage (ShaderGlobals *sg, const char *source_, const char *name_,
     const ustring &sourcefile (USTR(sourcefile_));
 
     // recreate TypeDesc -- we just crammed it into an int!
-    TypeDesc type (*(TypeDesc *)&type_);
+    TypeDesc type = TYPEDESC(type_);
     bool is_closure = (type.basetype == TypeDesc::UNKNOWN); // secret code for closure
     if (is_closure)
         type.basetype = TypeDesc::PTR;  // for closures, we store a pointer

src/liboslexec/oslexec_pvt.h

@@ -216,7 +216,7 @@ struct AttributeNeeded {
 #define DVEC(x) (*(Dual2<Vec3> *)x)
 #define COL(x) (*(Color3 *)x)
 #define DCOL(x) (*(Dual2<Color3> *)x)
-#define TYPEDESC(x) (*(TypeDesc *)&x)
+#define TYPEDESC(x) OIIO::bit_cast<long long,TypeDesc>(x)
 
 
 

src/testrender/sampling.h

@@ -193,7 +193,7 @@ struct Sampler {
             if (ii & 1)
                 rz ^= uint32_t(v2 >> 31);
 
-	    return Vec3((sx + jx) / AA, (sy + jy) / AA, rz * 2.3283063e-10f);
+        return Vec3((sx + jx) / AA, (sy + jy) / AA, rz * 2.3283063e-10f);
 	}
 
 private: