COMP: fixed some dashboard warnings (dead code, false positive)

Change-Id: I435cfb9093868bbd2f59b72f03b3843c971f4211
Kitware · Feb 9, 2016 · d3af33c · d3af33c
1 parent dfbd836
commit d3af33c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/Modules/Core/GPUCommon/src/itkGPUKernelManager.cxx b/Modules/Core/GPUCommon/src/itkGPUKernelManager.cxx
@@ -271,7 +271,6 @@ cl_int GPUKernelManager::GetKernelWorkGroupInfo(int kernelIdx,
       break;
     default:
       itkGenericExceptionMacro (<< "Unknown type of work goup information");
-      break;
     }
 
   cl_int errid = clGetKernelWorkGroupInfo(m_KernelContainer[kernelIdx], m_Manager->GetDeviceId(0),
@@ -296,7 +295,6 @@ cl_int GPUKernelManager::GetDeviceInfo(
       break;
     default:
       itkGenericExceptionMacro (<< "Unknown type of device info");
-      break;
     }
   OpenCLCheckError(errid, __FILE__, __LINE__, ITK_LOCATION);
 

diff --git a/Modules/IO/HDF5/src/itkHDF5ImageIO.cxx b/Modules/IO/HDF5/src/itkHDF5ImageIO.cxx
@@ -207,12 +207,13 @@ ComponentToPredType(ImageIOBase::IOComponentType cType)
       return H5::PredType::NATIVE_FLOAT;
     case ImageIOBase::DOUBLE:
       return H5::PredType::NATIVE_DOUBLE;
-    default:
+    case ImageIOBase::UNKNOWNCOMPONENTTYPE:
       itkGenericExceptionMacro(<< "unsupported IOComponentType"
                                << cType);
     }
-  // never reached but silences warning.
-  return H5::PredType::NATIVE_UCHAR;
+
+    itkGenericExceptionMacro(<< "unsupported IOComponentType"
+                             << cType);
 }
 
 std::string

diff --git a/Modules/Numerics/Statistics/include/itkSubsample.h b/Modules/Numerics/Statistics/include/itkSubsample.h
@@ -73,12 +73,27 @@ class Subsample:
    * object */
   typedef std::vector< InstanceIdentifier > InstanceIdentifierHolder;
 
+// Disable clang warning false positive.
+// <https://llvm.org/bugs/show_bug.cgi?id=22582>
+#if defined(__clang__) && defined(__has_warning)
+# if __has_warning("-Winconsistent-missing-override")
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Winconsistent-missing-override"
+# endif
+#endif
+
   /** Get the Id Holder */
   virtual const InstanceIdentifierHolder & GetIdHolder() const
   {
     return this->m_IdHolder;
   }
 
+#if defined(__clang__) && defined(__has_warning)
+# if __has_warning("-Winconsistent-missing-override")
+#  pragma clang diagnostic pop
+# endif
+#endif
+
   /** Plug in the actual sample data */
   void SetSample(const TSample *sample);