WRG: GCC pragma warning works for clang and gcc

Modules/Adapters/BoostAdapters/include/otbStringUtils.h

@@ -24,7 +24,7 @@
 #include <limits>
 #include <stdexcept>
 
-#if defined(__GNUC__) || (__clang__)
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 #include <boost/lexical_cast.hpp>

Modules/Adapters/BoostAdapters/include/otb_boost_expint_header.h

@@ -18,7 +18,7 @@
 #ifndef otb_boost_expint_header_h
 #define otb_boost_expint_header_h
 
-#if defined(__GNUC__) || (__clang__)
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #include <boost/math/special_functions/expint.hpp>

Modules/Adapters/BoostAdapters/include/otb_boost_graph_header.h

@@ -18,7 +18,7 @@
 #ifndef otb_boost_graph_header_h
 #define otb_boost_graph_header_h
 
-#if defined(__GNUC__) || (__clang__)
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 #pragma GCC diagnostic ignored "-Wunused-parameter"

Modules/Adapters/BoostAdapters/include/otb_boost_math_gamma_header.h

@@ -18,7 +18,7 @@
 #ifndef otb_boost_math_gamma_header_h
 #define otb_boost_math_gamma_header_h
 
-#if defined(__GNUC__) || (__clang__)
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #include <boost/math/special_functions/gamma.hpp>

Modules/Adapters/BoostAdapters/include/otb_boost_math_normal_header.h

@@ -18,7 +18,7 @@
 #ifndef otb_boost_math_normal_header_h
 #define otb_boost_math_normal_header_h
 
-#if defined(__GNUC__) || (__clang__)
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #include <boost/math/distributions/normal.hpp>

Modules/Adapters/BoostAdapters/include/otb_boost_string_header.h

@@ -18,7 +18,7 @@
 #ifndef otb_boost_string_header_h
 #define otb_boost_string_header_h
 
-#if defined(__GNUC__) || (__clang__)
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 #include <boost/algorithm/string.hpp>

Modules/Adapters/BoostAdapters/include/otb_boost_tokenizer_header.h

@@ -18,7 +18,7 @@
 #ifndef otb_boost_tokenizer_header_h
 #define otb_boost_tokenizer_header_h
 
-#if defined(__GNUC__) || (__clang__)
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #include <boost/foreach.hpp>

Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx

@@ -40,7 +40,7 @@
 // #include "boost/type_traits/is_array.hpp"
 #include "boost/type_traits/is_contiguous.h" // from OTB actually
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 #include "ogr_feature.h"  // OGRFeature::*field_getters

Modules/Adapters/GdalAdapters/src/otbOGRFeatureWrapper.cxx

@@ -22,7 +22,7 @@
 #include "otbOGRFeatureWrapper.h"
 #include <boost/bind.hpp>
 #include <boost/make_shared.hpp>
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 #include "ogr_feature.h"

Modules/Adapters/GdalAdapters/src/otbOGRFieldWrapper.cxx

@@ -19,7 +19,7 @@
 /*===========================================================================*/
 /*===============================[ Includes ]================================*/
 /*===========================================================================*/
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 #include "ogr_feature.h"

Modules/Adapters/GdalAdapters/src/otbOGRLayerWrapper.cxx

@@ -24,7 +24,7 @@
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 #include "gdal_priv.h"// GDALDataset

Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy1x.cxx

@@ -17,7 +17,7 @@
 =========================================================================*/
 #include "otbOGRVersionProxy.h"
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 #include "ogrsf_frmts.h"
@@ -42,14 +42,14 @@ void Close(GDALDatasetType * dataset)
 {
   OGRDataSource::DestroyDataSource(dataset);
 }
-  
+
 GDALDatasetType * Create(GDALDriverType * driver, const char * name)
 {
   GDALDatasetType * ds = driver->CreateDataSource(name);
 
-  if(ds)  
+  if(ds)
     ds->SetDriver(driver);
-  
+
   return ds;
 }
 
@@ -66,7 +66,7 @@ bool Delete(const char * name)
 
   if(poDriver && poDriver->TestCapability(ODrCDeleteDataSource))
     {
-    
+
     OGRErr ret = poDriver->DeleteDataSource(name);
     return (ret == OGRERR_NONE);
     }
@@ -94,7 +94,7 @@ std::vector<std::string> GetFileListAsStringVector(GDALDatasetType * dataset)
   std::vector<std::string> ret;
 
   ret.push_back(std::string(dataset->GetName()));
-  
+
   return ret;
 }
 
@@ -108,9 +108,9 @@ bool SyncToDisk(GDALDatasetType * dataset)
 std::vector<std::string> GetAvailableDriversAsStringVector()
 {
   std::vector<std::string> ret;
-  
+
   int nbDrivers = OGRSFDriverRegistrar::GetRegistrar()->GetDriverCount();
-  
+
   for(int i = 0; i < nbDrivers;++i)
     {
     ret.push_back(OGRSFDriverRegistrar::GetRegistrar()->GetDriver(i)->GetName());

Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy2x.cxx

@@ -17,7 +17,7 @@
 =========================================================================*/
 #include "otbOGRVersionProxy.h"
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 #include "gdal_priv.h"
@@ -43,7 +43,7 @@ void Close(GDALDatasetType * dataset)
 {
   GDALClose(dataset);
 }
-  
+
 GDALDatasetType * Create(GDALDriverType * driver, const char * name)
 {
   return driver->Create(name,0,0,0,GDT_Unknown,NULL);
@@ -99,7 +99,7 @@ public:
   {
     return const_cast<const char **>(m_P);
   }
-  
+
   ~CharPPCapsule()
   {
     if(m_P)
@@ -114,11 +114,11 @@ private:
 std::vector<std::string> GetFileListAsStringVector(GDALDatasetType * dataset)
 {
   std::vector<std::string> ret;
-  
+
   raii::CharPPCapsule capsule(dataset->GetFileList());
 
   std::string files_str="";
-      
+
   if(capsule.P())
     {
     unsigned int i = 0;
@@ -126,7 +126,7 @@ std::vector<std::string> GetFileListAsStringVector(GDALDatasetType * dataset)
       {
       ret.push_back(std::string(capsule.P()[i]));
       ++i;
-      } 
+      }
     }
   return ret;
 }
@@ -141,9 +141,9 @@ bool SyncToDisk(GDALDatasetType * dataset)
 std::vector<std::string> GetAvailableDriversAsStringVector()
 {
   std::vector<std::string> ret;
-  
+
   int nbDrivers = GetGDALDriverManager()->GetDriverCount();
-  
+
   for(int i = 0; i < nbDrivers;++i)
     {
     ret.push_back(GDALGetDriverShortName(GetGDALDriverManager()->GetDriver(i)));

Modules/Adapters/OSSIMAdapters/src/otbDEMConvertAdapter.cxx

@@ -21,7 +21,7 @@
 #include "itkMacro.h"
 
 // OSSIM include
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Woverloaded-virtual"

Modules/Adapters/OSSIMAdapters/src/otbDEMHandler.cxx

@@ -20,7 +20,7 @@
 
 #include <cassert>
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Woverloaded-virtual"

Modules/Adapters/OSSIMAdapters/src/otbEllipsoidAdapter.cxx

@@ -18,7 +18,7 @@
 
 #include "otbEllipsoidAdapter.h"
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Woverloaded-virtual"

Modules/Adapters/OSSIMAdapters/src/otbGeometricSarSensorModelAdapter.cxx

@@ -21,7 +21,7 @@
 #include "otbMacro.h"
 #include "otbImageKeywordlist.h"
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Woverloaded-virtual"

Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx

@@ -23,7 +23,7 @@
 
 #include "gdal_priv.h"
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Woverloaded-virtual"

Modules/Adapters/OSSIMAdapters/src/otbMapProjectionAdapter.cxx

@@ -23,7 +23,7 @@
 #include "otbMacro.h"
 #include "otbUtils.h"
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Woverloaded-virtual"

Modules/Adapters/OSSIMAdapters/src/otbRPCSolverAdapter.cxx

@@ -20,7 +20,7 @@
 #include "otbImageKeywordlist.h"
 #include "otbMacro.h"
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Woverloaded-virtual"