[Pkg-ace-commits] [pkg-ace] r581 - trunk/debian/patches

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-04-04 17:22:37 +0000 (Fri, 04 Apr 2008)
New Revision: 581

Added:
   trunk/debian/patches/19-gcc43.dpatch
   trunk/debian/patches/20-fix-iostream-detection.dpatch
Modified:
   trunk/debian/patches/00list
Log:
add two new patches to improve g++ 4.3 support


Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-04-02 17:15:44 UTC (rev 580)
+++ trunk/debian/patches/00list	2008-04-04 17:22:37 UTC (rev 581)
@@ -14,6 +14,8 @@
 15-fix-fltk-include
 17-protect-mpc-path
 18-fix-bswap-detection
+19-gcc43
+20-fix-iostream-detection
 34-bts386713
 50-prepatch-dummy-mark
 90-patch-mpc-basedir

Added: trunk/debian/patches/19-gcc43.dpatch
===================================================================
--- trunk/debian/patches/19-gcc43.dpatch	                        (rev 0)
+++ trunk/debian/patches/19-gcc43.dpatch	2008-04-04 17:22:37 UTC (rev 581)
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 19-gcc43.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## DP: fix failures and warnings with g++ 4.3
+## DP: See http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=3270
+ at DPATCH@
+--- ACE_wrappers.orig/ace/config-macros.h
++++ ACE_wrappers/ace/config-macros.h
+@@ -380,7 +380,7 @@
+ // This eliminates the warnings, and no code is generated for the null
+ // conditional statement.  @note that may only be true if -O is enabled,
+ // such as with GreenHills (ghs) 1.8.8.
+-# define ACE_UNUSED_ARG(a) do {/* null */} while (&a == 0)
++# define ACE_UNUSED_ARG(a) do {/* null */} while (&a < 0)
+ #elif defined (__DMC__)
+   #define ACE_UNUSED_ID(identifier)
+   template <class T>
+--- ACE_wrappers.orig/ace/Free_List.cpp
++++ ACE_wrappers/ace/Free_List.cpp
+@@ -115,11 +115,13 @@
+ 
+   // Check if we are allowed to resize
+   if (this->mode_ != ACE_PURE_FREE_LIST)
+-    // Check to see if we grow or shrink
+-    if (newsize < this->size_)
+-      this->dealloc (this->size_ - newsize);
+-    else
+-      this->alloc (newsize - this->size_);
++    {
++      // Check to see if we grow or shrink
++      if (newsize < this->size_)
++        this->dealloc (this->size_ - newsize);
++      else
++        this->alloc (newsize - this->size_);
++    }
+ }
+ 
+ // Allocates <n> extra nodes for the freelist
+--- ACE_wrappers.orig/apps/JAWS/server/HTTP_Server.cpp
++++ ACE_wrappers/apps/JAWS/server/HTTP_Server.cpp
+@@ -143,10 +143,12 @@
+   HTTP_Handler_Factory *f = 0;
+ 
+   if (this->strategy_ != (JAWS::JAWS_POOL | JAWS::JAWS_ASYNCH))
++    {
+ 	  if (this->caching_)
+ 		  ACE_NEW_RETURN (f, Synch_HTTP_Handler_Factory (), -1);
+ 	  else
+ 		  ACE_NEW_RETURN (f, No_Cache_Synch_HTTP_Handler_Factory (), -1);
++    }
+ 
+   //NOTE: At this point f better not be a NULL pointer,
+   //so please do not change the ACE_NEW_RETURN macros unless


Property changes on: trunk/debian/patches/19-gcc43.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/debian/patches/20-fix-iostream-detection.dpatch
===================================================================
--- trunk/debian/patches/20-fix-iostream-detection.dpatch	                        (rev 0)
+++ trunk/debian/patches/20-fix-iostream-detection.dpatch	2008-04-04 17:22:37 UTC (rev 581)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-autoconf-fix-iostream.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## DP: fix autotools iostream detection
+ at DPATCH@
+--- ACE_wrappers.orig/configure.ac
++++ ACE_wrappers/configure.ac
+@@ -1013,11 +1013,9 @@
+ dnl Check for availablity of "new style" C++ stream headers
+ AC_CHECK_HEADERS([iomanip ios iostream istream ostream fstream streambuf],
+   ,
+-  [AC_DEFINE([ACE_USES_OLD_IOSTREAMS])])
+-
+-AC_CHECK_HEADER([iostream.h],
+-  [AC_CHECK_HEADER([fstream.h],,[AC_DEFINE([ACE_LACKS_IOSTREAM_TOTALLY])])],
+-  [AC_DEFINE([ACE_LACKS_IOSTREAM_TOTALLY])])
++  [AC_CHECK_HEADERS([iostream.h fstream.h],
++                    [AC_DEFINE([ACE_USES_OLD_IOSTREAMS])],
++                    [AC_DEFINE([ACE_LACKS_IOSTREAM_TOTALLY])])])
+ 
+ dnl Check if platform needs to #include <regexpr.h> for
+ dnl regular expression support


Property changes on: trunk/debian/patches/20-fix-iostream-detection.dpatch
___________________________________________________________________
Name: svn:executable
   + *