Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sébastien Peillet
otb
Commits
29683721
Commit
29683721
authored
8 years ago
by
Rashad Kanavath
Browse files
Options
Downloads
Patches
Plain Diff
SuperBuild: fix build for gcc6
parent
d5a88dde
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
SuperBuild/patches/OSSIM/ossim-4-trac_2354-linux.diff
+51
-0
51 additions, 0 deletions
SuperBuild/patches/OSSIM/ossim-4-trac_2354-linux.diff
SuperBuild/patches/QT4/qt4-3-force-std98-linux.diff
+12
-0
12 additions, 0 deletions
SuperBuild/patches/QT4/qt4-3-force-std98-linux.diff
with
63 additions
and
0 deletions
SuperBuild/patches/OSSIM/ossim-4-trac_2354-linux.diff
0 → 100755
+
51
−
0
View file @
29683721
Description: Fix build failure with GCC 6: no match for 'operator<<'.
Author: Rashad M <rashadkm@gmail.com>
Origin: https://trac.osgeo.org/ossim/attachment/ticket/2354/fix-ossim-trac-2354.diff
Bug-Debian: https://bugs.debian.org/811851
Bug: https://trac.osgeo.org/ossim/ticket/2354
--- a/ossim/src/ossim/elevation/ossimElevManager.cpp
+++ b/ossim/src/ossim/elevation/ossimElevManager.cpp
@@ -643,14 +643,26 @@
std::ostream& ossimElevManager::print(os
<< "\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;
+
+
+
}
--- a/ossim/src/ossim/elevation/ossimElevSource.cpp
+++ b/ossim/src/ossim/elevation/ossimElevSource.cpp
@@ -269,8 +269,9 @@
std::ostream& ossimElevSource::print(std
<< "\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;
}
This diff is collapsed.
Click to expand it.
SuperBuild/patches/QT4/qt4-3-force-std98-linux.diff
0 → 100755
+
12
−
0
View file @
29683721
diff -burN qt-everywhere-opensource-src-4.8.7.orig/mkspecs/common/linux.conf qt-everywhere-opensource-src-4.8.7/mkspecs/common/linux.conf
--- qt-everywhere-opensource-src-4.8.7.orig/mkspecs/common/linux.conf 2016-12-07 11:19:59.964124979 +0100
+++ qt-everywhere-opensource-src-4.8.7/mkspecs/common/linux.conf 2016-12-07 11:22:29.116132748 +0100
@@ -1,7 +1,7 @@
#
# qmake configuration for common linux
#
-
+QMAKE_CXXFLAGS += -w -std=c++98
QMAKE_CFLAGS_THREAD += -D_REENTRANT
QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment