Merge branch 'fix-build-2264' of https://github.com/sciinstitute/scirun into improved_superquadrics

Author: tarkpate

src/Core/Datatypes/TensorBase.h

@@ -28,7 +28,9 @@
 #ifndef CORE_DATATYPES_TENSOR_BASE_H
 #define CORE_DATATYPES_TENSOR_BASE_H
 
+#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include <unsupported/Eigen/CXX11/Tensor>
+#pragma GCC diagnostic error "-Wunused-parameter"
 #include <Core/Datatypes/share.h>
 
 namespace SCIRun {

src/Core/GeometryPrimitives/BBox.h

@@ -164,14 +164,14 @@ namespace Geometry {
     {
       /// @todo: C assert: assert(is_valid_);
       Vector diagonal(cmax_-cmin_);
-      return Max(diagonal.x(), diagonal.y(), diagonal.z());
+      return (std::max)({diagonal.x(), diagonal.y(), diagonal.z()});
     }
 
     inline double shortest_edge() const
     {
       /// @todo: C assert: assert(is_valid_);
       Vector diagonal(cmax_-cmin_);
-      return Min(diagonal.x(), diagonal.y(), diagonal.z());
+      return (std::min)({diagonal.x(), diagonal.y(), diagonal.z()});
     }
 
     /// Check whether two BBoxes are similar

src/Core/GeometryPrimitives/Vector.h

@@ -48,18 +48,6 @@ namespace Core {
 namespace Geometry {
 
   /// @todo move to math header
-  template <typename T>
-  inline const T& Min(const T& t1, const T& t2, const T& t3)
-  {
-    return std::min(std::min(t1,t2), t3);
-  }
-
-  template <typename T>
-  inline const T& Max(const T& t1, const T& t2, const T& t3)
-  {
-    return std::max(std::max(t1,t2), t3);
-  }
-
 class Point;
 
 class Vector
@@ -263,12 +251,12 @@ inline double Vector::length2() const
 
 inline double Vector::minComponent() const
 {
-  return Min(d_[0], d_[1], d_[2]);
+  return (std::min)({d_[0], d_[1], d_[2]});
 }
 
 inline double Vector::maxComponent() const
 {
-  return Max(d_[0], d_[1], d_[2]);
+  return (std::max)({d_[0], d_[1], d_[2]});
 }
 
 inline Vector Vector::operator/(const double d) const

src/Graphics/Widgets/Tests/WidgetTestingUtility.h

@@ -71,13 +71,13 @@ namespace SCIRun
       class SCISHARE StubGlyphFactory : public AbstractGlyphFactory
       {
       public:
-        std::string sphere(SphereParameters params, WidgetBase& widget) const override { return "__sphere__" + std::to_string(instanceCount_++); }
-        std::string disk(DiskParameters params, WidgetBase& widget) const override { return "__disk__" + std::to_string(instanceCount_++); }
-        std::string cone(ConeParameters params, WidgetBase& widget) const override { return "__cone__" + std::to_string(instanceCount_++); }
-        std::string cylinder(CylinderParameters params, WidgetBase& widget) const override { return "__cylinder__" + std::to_string(instanceCount_++); }
-        std::string basicBox(BasicBoundingBoxParameters params, WidgetBase& widget) const override { return "__basicBox__" + std::to_string(instanceCount_++); }
-        std::string box(BoundingBoxParameters params, WidgetBase& widget) const override { return "__box__" + std::to_string(instanceCount_++); }
-        std::string superquadric(SuperquadricParameters params, WidgetBase& widget) const override { return "__superquadric__" + std::to_string(instanceCount_++); }
+        std::string sphere(SphereParameters, WidgetBase& ) const override { return "__sphere__" + std::to_string(instanceCount_++); }
+        std::string disk(DiskParameters, WidgetBase&) const override { return "__disk__" + std::to_string(instanceCount_++); }
+        std::string cone(ConeParameters, WidgetBase&) const override { return "__cone__" + std::to_string(instanceCount_++); }
+        std::string cylinder(CylinderParameters, WidgetBase&) const override { return "__cylinder__" + std::to_string(instanceCount_++); }
+        std::string basicBox(BasicBoundingBoxParameters, WidgetBase&) const override { return "__basicBox__" + std::to_string(instanceCount_++); }
+        std::string box(BoundingBoxParameters, WidgetBase&) const override { return "__box__" + std::to_string(instanceCount_++); }
+        std::string superquadric(SuperquadricParameters, WidgetBase&) const override { return "__superquadric__" + std::to_string(instanceCount_++); }
       private:
         mutable int instanceCount_{0};
       };

src/Interface/Modules/Render/Tests/ObjectTranslationTests.cc

@@ -39,7 +39,7 @@ static const ScreenParams screen_;
 
 size_t ScreenParametersTest::getScreenWidthPixels() const { return screen_.width; }
 size_t ScreenParametersTest::getScreenHeightPixels() const { return screen_.height; }
-void ScreenParametersTest::calculateScreenSpaceCoords(int x_in, int y_in, float& x_out, float& y_out) { throw "not needed"; }
+void ScreenParametersTest::calculateScreenSpaceCoords(int, int, float&, float&) { throw "not needed"; }
 MouseMode ScreenParametersTest::getMouseMode() const { throw "not needed"; }
 
 static const ScreenParametersTest spt;