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

[Andreas Tille]

Author: tille
Date: 2011-12-19 15:36:02 +0000 (Mon, 19 Dec 2011)
New Revision: 9047

Added:
   trunk/packages/sofa-framework/trunk/debian/patches/10_add_missing_include.patch
Removed:
   trunk/packages/sofa-framework/trunk/debian/patches/fix_mutable_serr_sout.diff
Modified:
   trunk/packages/sofa-framework/trunk/debian/patches/series
Log:
Part of patch was applied upstream


Added: trunk/packages/sofa-framework/trunk/debian/patches/10_add_missing_include.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/10_add_missing_include.patch	                        (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/10_add_missing_include.patch	2011-12-19 15:36:02 UTC (rev 9047)
@@ -0,0 +1,13 @@
+Author: Dominique Belhachemi <domibel at debian.org>
+Description: Add missing include statement
+
+--- sofa-1.0-rc1.orig/framework/sofa/core/core.h
++++ sofa-1.0-rc1/framework/sofa/core/core.h
+@@ -26,6 +26,7 @@
+ #define SOFA_CORE_H
+ 
+ #include <sofa/helper/system/config.h>
++#include <cstddef>
+ 
+ #ifdef SOFA_BUILD_CORE
+ #	define SOFA_CORE_API SOFA_EXPORT_DYNAMIC_LIBRARY

Deleted: trunk/packages/sofa-framework/trunk/debian/patches/fix_mutable_serr_sout.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/fix_mutable_serr_sout.diff	2011-12-19 15:31:05 UTC (rev 9046)
+++ trunk/packages/sofa-framework/trunk/debian/patches/fix_mutable_serr_sout.diff	2011-12-19 15:36:02 UTC (rev 9047)
@@ -1,32 +0,0 @@
-## 78_atomicity.dpatch by  <domibel at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix #625059 , error: reference 'serr' cannot be declared 'mutable' [-fpermissive]
-
-Index: sofa-framework-1.0~beta4/framework/sofa/core/objectmodel/Base.h
-===================================================================
---- sofa-framework-1.0~beta4.orig/framework/sofa/core/objectmodel/Base.h	2011-05-07 16:18:02.000000000 -0400
-+++ sofa-framework-1.0~beta4/framework/sofa/core/objectmodel/Base.h	2011-05-07 16:18:06.000000000 -0400
-@@ -279,8 +279,8 @@
-     std::multimap< std::string, BaseData* > getAliases() { return m_aliasData; }
- 
-     mutable sofa::helper::system::SofaOStream sendl;
--    mutable std::ostringstream               &serr;
--    mutable std::ostringstream               &sout;
-+    std::ostringstream               &serr;
-+    std::ostringstream               &sout;
- 
- 
- protected:
-Index: sofa-framework-1.0~beta4/framework/sofa/core/core.h
-===================================================================
---- sofa-framework-1.0~beta4.orig/framework/sofa/core/core.h	2011-05-07 16:21:56.000000000 -0400
-+++ sofa-framework-1.0~beta4/framework/sofa/core/core.h	2011-05-07 16:22:12.000000000 -0400
-@@ -28,6 +28,7 @@
- #define SOFA_CORE_H
- 
- #include <sofa/helper/system/config.h>
-+#include <cstddef>
- 
- #ifdef SOFA_BUILD_CORE
- #	define SOFA_CORE_API SOFA_EXPORT_DYNAMIC_LIBRARY

Modified: trunk/packages/sofa-framework/trunk/debian/patches/series
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/series	2011-12-19 15:31:05 UTC (rev 9046)
+++ trunk/packages/sofa-framework/trunk/debian/patches/series	2011-12-19 15:36:02 UTC (rev 9047)
@@ -3,6 +3,6 @@
 20_debian_config.patch
 10_fix_mips_sqrt.patch
 20_ignore_missing_atomicity_h.patch
-fix_mutable_serr_sout.diff
+10_add_missing_include.patch
 tinyxml26.diff
 qwt5-qt4.patch