Cleanup warnings for clang -Wall

Signed-off-by: Kimball Thurston <[email protected]>
AcademySoftwareFoundation · Jul 23, 2019 · a514bf5 · a514bf5
1 parent b5653ed
commit a514bf5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/PyIlmBase/PyImath/PyImathFixedMatrix.h b/PyIlmBase/PyImath/PyImathFixedMatrix.h
@@ -40,6 +40,10 @@
 #include "PyImathFixedArray.h"
 #include "PyImathOperators.h"
 
+#ifdef __clang__
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wself-assign-overloaded"
+#endif
 namespace PyImath {
 
 //
@@ -540,5 +544,8 @@ static void add_bitwise_math_functions(boost::python::class_<FixedMatrix<T> > &c
 
 
 }
+#ifdef __clang__
+#    pragma clang diagnostic pop
+#endif
 
 #endif
diff --git a/PyIlmBase/PyImath/PyImathLine.cpp b/PyIlmBase/PyImath/PyImathLine.cpp
@@ -348,8 +348,7 @@ intersect2(Line3<T> &line, const Vec3<T> &v0, const Vec3<T> &v1, const Vec3<T> &
 
     if(IMATH_NAMESPACE::intersect(line, v0, v1, v2, pt, bar, front))
     {
-        tuple t = make_tuple(pt, bar, front);
-        return t;
+        return make_tuple (pt, bar, front);
     }
     else
     {
@@ -591,5 +590,3 @@ template PYIMATH_EXPORT class_<Line3<float> > register_Line<float>();
 template PYIMATH_EXPORT class_<Line3<double> > register_Line<double>();
 
 } // namespace PyImath
-
-