Merge branch 'sb-clang7-fixes' into 'develop'

SuperBuild: the Ossim issue 2354 now affects all platforms

See merge request orfeotoolbox/otb!285

SuperBuild/patches/OSSIM/ossim-3-fixes-win.diff

@@ -33,42 +33,3 @@ diff -burN ossim-1.8.20-3.orig/ossim/src/ossim/base/ossimDate.cpp ossim-1.8.20-3
  #else
     gmt.tm_sec += timezone; // Seconds west of UTC
     if ( tm_isdst )
-diff -burN ossim-1.8.20-3.orig/ossim/src/ossim/elevation/ossimElevManager.cpp ossim-1.8.20-3/ossim/src/ossim/elevation/ossimElevManager.cpp
---- ossim-1.8.20-3.orig/ossim/src/ossim/elevation/ossimElevManager.cpp	2016-07-15 16:36:31.645857590 +0200
-+++ ossim-1.8.20-3/ossim/src/ossim/elevation/ossimElevManager.cpp	2016-07-15 16:37:09.705859432 +0200
-@@ -647,10 +647,18 @@
-    {
-       out<<"\nm_dbRoundRobin["<<i<<"].size = "<<m_dbRoundRobin[i].size()<<endl;
-       for (ossim_uint32 j=0; j<m_dbRoundRobin[i].size(); ++j)
--         out<<"m_dbRoundRobin["<<i<<"]["<<j<<"] = "<<m_dbRoundRobin[i][j]->print(out)<<endl;
-+      {
-+         out<<"m_dbRoundRobin["<<i<<"]["<<j<<"] = ";
-+         // GP: We have to separate this line.  On MS it will not compile
-+         // otherwise
-+         m_dbRoundRobin[i][j]->print(out);
-+
-+      }
-+         out<<endl;
-    }
--   cout<<"\n"<<ossimElevSource::print(cout);
--   return out;
-+   out<<"\n";
-+   ossimElevSource::print(out);
-+return out;
- }
- 
- 
-diff -burN ossim-1.8.20-3.orig/ossim/src/ossim/elevation/ossimElevSource.cpp ossim-1.8.20-3/ossim/src/ossim/elevation/ossimElevSource.cpp
---- ossim-1.8.20-3.orig/ossim/src/ossim/elevation/ossimElevSource.cpp	2016-07-15 16:36:31.645857590 +0200
-+++ ossim-1.8.20-3/ossim/src/ossim/elevation/ossimElevSource.cpp	2016-07-15 16:37:09.709859432 +0200
-@@ -269,8 +269,8 @@
-          << "\ntheMaxHeightAboveMSL = "<<theMaxHeightAboveMSL
-          << "\ntheNullHeightValue = "<<theNullHeightValue
-          << "\ntheSeaLevelValue = "<<theSeaLevelValue
--         << "\ntheGroundRect = "<<theGroundRect
--         << ossimSource::print(out);
-+         << "\ntheGroundRect = "<<theGroundRect;
-+        ossimSource::print(out);
-    return out;
- }
- 

SuperBuild/patches/OSSIM/ossim-6-clang7-all.diff

@@ -10,37 +10,3 @@ diff -burN OSSIM-orig/ossim/src/ossim/base/ossimArgumentParser.cpp OSSIM/ossim/s
     theArgc = argc;
     theArgv = new char*[*argc];
     for(int i=0;i<*argc;i++)
-diff -burN OSSIM-orig/ossim/src/ossim/elevation/ossimElevManager.cpp OSSIM/ossim/src/ossim/elevation/ossimElevManager.cpp
---- OSSIM-orig/ossim/src/ossim/elevation/ossimElevManager.cpp	2018-11-07 16:07:36.000000000 +0100
-+++ OSSIM/ossim/src/ossim/elevation/ossimElevManager.cpp	2018-11-07 16:25:43.000000000 +0100
-@@ -647,9 +647,14 @@
-    {
-       out<<"\nm_dbRoundRobin["<<i<<"].size = "<<m_dbRoundRobin[i].size()<<endl;
-       for (ossim_uint32 j=0; j<m_dbRoundRobin[i].size(); ++j)
--         out<<"m_dbRoundRobin["<<i<<"]["<<j<<"] = "<<m_dbRoundRobin[i][j]->print(out)<<endl;
-+         {
-+         out<<"m_dbRoundRobin["<<i<<"]["<<j<<"] = ";
-+         m_dbRoundRobin[i][j]->print(out);
-+         out<<endl;
-+         }
-    }
--   cout<<"\n"<<ossimElevSource::print(cout);
-+   cout<<"\n";
-+   ossimElevSource::print(cout);
-    return out;
- }
- 
-diff -burN OSSIM-orig/ossim/src/ossim/elevation/ossimElevSource.cpp OSSIM/ossim/src/ossim/elevation/ossimElevSource.cpp
---- OSSIM-orig/ossim/src/ossim/elevation/ossimElevSource.cpp	2018-11-07 16:07:36.000000000 +0100
-+++ OSSIM/ossim/src/ossim/elevation/ossimElevSource.cpp	2018-11-07 16:27:06.000000000 +0100
-@@ -269,8 +269,8 @@
-          << "\ntheMaxHeightAboveMSL = "<<theMaxHeightAboveMSL
-          << "\ntheNullHeightValue = "<<theNullHeightValue
-          << "\ntheSeaLevelValue = "<<theSeaLevelValue
--         << "\ntheGroundRect = "<<theGroundRect
--         << ossimSource::print(out);
-+         << "\ntheGroundRect = "<<theGroundRect;
-+   ossimSource::print(out);
-    return out;
- }
-