[med-svn] r22451 - trunk/packages/sofa-framework/trunk/debian/patches

[Gert Wollny]

Author: gert-guest
Date: 2016-07-08 15:55:08 +0000 (Fri, 08 Jul 2016)
New Revision: 22451

Added:
   trunk/packages/sofa-framework/trunk/debian/patches/gcc-6.patch
Modified:
   trunk/packages/sofa-framework/trunk/debian/patches/series
Log:
Add gcc-6 patch, Closes: #811747

Added: trunk/packages/sofa-framework/trunk/debian/patches/gcc-6.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/gcc-6.patch	                        (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/gcc-6.patch	2016-07-08 15:55:08 UTC (rev 22451)
@@ -0,0 +1,53 @@
+--- a/extlibs/miniFlowVR/src/ftlm/type.cpp
++++ b/extlibs/miniFlowVR/src/ftlm/type.cpp
+@@ -306,7 +306,7 @@
+ // type <-> string
+ 
+ typedef struct {
+-  int t;
++  unsigned int t;
+   const char* name;
+ } TypeToString;
+ 
+--- a/framework/sofa/helper/system/SofaOStream.cpp
++++ b/framework/sofa/helper/system/SofaOStream.cpp
+@@ -46,7 +46,7 @@
+ 
+       void SofaOStream::processStream(std::ostream& out)
+       {
+-	if (out == *serr)
++	if (&out == serr)
+ 	  {	    
+ 	    *serr << "\n";
+ 	    // if (isOutputConsole())
+@@ -54,7 +54,7 @@
+ 	    warnings += serr->str();
+ 	    serr->str("");
+ 	  }
+-	else if (out == *sout)
++	else if (&out == sout)
+ 	  {	   
+ 	    *sout << "\n";
+             if (outputConsole) std::cout<< "[" << nameComponent << "(" << nameClass << ")]: "<< sout->str();
+--- a/applications/sofa/gui/qt/ModifyObject.cpp
++++ b/applications/sofa/gui/qt/ModifyObject.cpp
+@@ -1221,7 +1221,7 @@
+ 	  {
+ 	    if (objectGUI[i].second == object) return  objectGUI[i].first;
+ 	  }
+-	return false;
++	return NULL;
+       }
+ 
+       void ModifyObject::resizeTable(int number)
+--- a/modules/sofa/component/topology/SparseGridTopology.cpp
++++ b/modules/sofa/component/topology/SparseGridTopology.cpp
+@@ -287,7 +287,7 @@
+ 	    if (dataVoxels.getValue().size() == 0)
+ 	    {
+ 	      std::ifstream file( filename.c_str() );
+-	      if ( file == NULL )
++	      if ( file.fail() )
+ 	      {
+ 		serr << "SparseGridTopology: failed to open file " << filename << sendl;
+ 		return;

Modified: trunk/packages/sofa-framework/trunk/debian/patches/series
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/series	2016-07-08 15:50:23 UTC (rev 22450)
+++ trunk/packages/sofa-framework/trunk/debian/patches/series	2016-07-08 15:55:08 UTC (rev 22451)
@@ -10,3 +10,4 @@
 fix-undefined-symbol.patch
 default-arguments-in-definition.patch
 gcc-4-9-workaround.patch
+gcc-6.patch