From 86ad512e90e2f216a3948f77089d56335bfaad25 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Wed, 7 Nov 2018 17:15:36 +0100
Subject: [PATCH] COMP: fix ossim to build with clang7
---
.../patches/OSSIM/ossim-6-clang7-all.diff | 46 +++++++++++++++++++
1 file changed, 46 insertions(+)
create mode 100644 SuperBuild/patches/OSSIM/ossim-6-clang7-all.diff
diff --git a/SuperBuild/patches/OSSIM/ossim-6-clang7-all.diff b/SuperBuild/patches/OSSIM/ossim-6-clang7-all.diff
new file mode 100644
index 0000000000..895f1a718e
--- /dev/null
+++ b/SuperBuild/patches/OSSIM/ossim-6-clang7-all.diff
@@ -0,0 +1,46 @@
+diff -burN OSSIM-orig/ossim/src/ossim/base/ossimArgumentParser.cpp OSSIM/ossim/src/ossim/base/ossimArgumentParser.cpp
+--- OSSIM-orig/ossim/src/ossim/base/ossimArgumentParser.cpp 2018-11-07 16:07:35.000000000 +0100
++++ OSSIM/ossim/src/ossim/base/ossimArgumentParser.cpp 2018-11-07 16:16:01.000000000 +0100
+@@ -191,7 +191,7 @@
+
+ void ossimArgumentParser::initialize(int* argc, const char **argv)
+ {
+- if(argc > 0) delete (theArgv);
++ if(*argc > 0) delete (theArgv);
+ 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;
+ }
+
--
GitLab