[ossim] 01/02: Update fix-ossim-trac-2354.diff with alternative to fix FTBFS with GCC 6.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository ossim.

commit 5415e7729e332e4c9e436b0daf93a9f157967629
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 5 16:14:37 2016 +0200

    Update fix-ossim-trac-2354.diff with alternative to fix FTBFS with GCC 6.
---
 debian/changelog                        |  7 ++++
 debian/patches/fix-ossim-trac-2354.diff | 58 +++++++++++++++++++++------------
 2 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2274127..afc87f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ossim (1.8.20.3+ds-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Update fix-ossim-trac-2354.diff with alternative to fix FTBFS with GCC 6.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 05 Jul 2016 16:13:34 +0200
+
 ossim (1.8.20.3+ds-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/fix-ossim-trac-2354.diff b/debian/patches/fix-ossim-trac-2354.diff
index 88d890d..eb7e32b 100644
--- a/debian/patches/fix-ossim-trac-2354.diff
+++ b/debian/patches/fix-ossim-trac-2354.diff
@@ -6,29 +6,47 @@ Bug: https://trac.osgeo.org/ossim/ticket/2354
 
 --- a/ossim/src/ossim/elevation/ossimElevManager.cpp
 +++ b/ossim/src/ossim/elevation/ossimElevManager.cpp
-@@ -635,6 +635,11 @@ double ossimElevManager::getMeanSpacingM
-    return spacing;
+@@ -643,14 +643,26 @@
+          << "\nm_useGeoidIfNullFlag = "<<m_useGeoidIfNullFlag
+          << "\nm_currentDatabaseIdx = "<<m_currentDatabaseIdx
+          << "\nm_dbRoundRobin.size = "<<m_dbRoundRobin.size();
++
+    for (ossim_uint32 i=0; i<m_dbRoundRobin.size(); ++i)
+    {
+       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);
++   out<<"\n";
++   ossimElevSource::print(out);
+    return out;
++
++
++
  }
  
-+inline std::ostream& operator<<(std::ostream& out, std::ostream& obj)
-+{
-+  return obj;
-+}
-+
- std::ostream& ossimElevManager::print(ostream& out) const
- {
-    out << "\nossimElevManager @ "<< (ossim_uint64) this
+ 
+diff -burN diff/ossim-1.8.20-3/ossim/src/ossim/elevation/ossimElevSource.cpp ossim-1.8.20-3/ossim/src/ossim/elevation/ossimElevSource.cpp
 --- a/ossim/src/ossim/elevation/ossimElevSource.cpp
 +++ b/ossim/src/ossim/elevation/ossimElevSource.cpp
-@@ -262,6 +262,11 @@ void ossimElevSource::setComputeStatisti
-    theComputeStatsFlag = flag;
+@@ -269,8 +269,9 @@
+          << "\ntheMaxHeightAboveMSL = "<<theMaxHeightAboveMSL
+          << "\ntheNullHeightValue = "<<theNullHeightValue
+          << "\ntheSeaLevelValue = "<<theSeaLevelValue
+-         << "\ntheGroundRect = "<<theGroundRect
+-         << ossimSource::print(out);
++         << "\ntheGroundRect = "<<theGroundRect;
++         // GP: need this by itself.  MS errors out
++         ossimSource::print(out);
+    return out;
  }
  
-+inline std::ostream& operator<<(std::ostream& out, std::ostream& obj)
-+{
-+  return obj;
-+}
-+
- std::ostream& ossimElevSource::print(std::ostream& out) const
- {
-    out << "\nossimElevSource @ "<< (ossim_uint64) this

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim.git