فهرست منبع

Minimize patch changes, and replace global std namespace declaration with four local ones

Michael Schloh von Bennewitz 23 سال پیش
والد
کامیت
1b207dab35
2فایلهای تغییر یافته به همراه39 افزوده شده و 6 حذف شده
  1. 38 5
      mico/mico.patch
  2. 1 1
      mico/mico.spec

+ 38 - 5
mico/mico.patch

@@ -10,18 +10,51 @@ diff -Naur mico.orig/Makefile mico/Makefile
  
  install-cd:
  	for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done
---- mico.orig/include/mico/os-math.h	2003-06-13 16:07:15.000000000 +0200
-+++ mico/include/mico/os-math.h	2003-06-13 16:07:16.000000000 +0200
-@@ -280,10 +280,8 @@
+diff -Naur mico.orig/include/mico/os-math.h mico/include/mico/os-math.h
+--- mico.orig/include/mico/os-math.h	2003-05-26 12:55:46.000000000 +0200
++++ mico/include/mico/os-math.h	2003-07-01 12:00:36.000000000 +0200
+@@ -279,11 +279,7 @@
+ #include <unistd.h>
  #include <signal.h>
  #include <sys/types.h>
- 
+-
 -#if !defined(__GNUG__) || !defined(__sgi)
 -// conflict for initstate ()
 -#include <math.h>
 -#endif
 +#include <cmath>
-+using namespace std;
  
  #ifdef HAVE_FLOAT_H
  #include <float.h>
+@@ -343,6 +339,7 @@
+ 
+     static MICO_Boolean is_infinity (MICO_Double d)
+     {
++        using namespace std;
+ #if defined(HAVE_ISINF)
+ 	return isinf (d);
+ #elif defined(HAVE_FINITE) && defined(HAVE_ISNAN)
+@@ -354,6 +351,7 @@
+ 
+     static MICO_Boolean is_nan (MICO_Double d)
+     {
++        using namespace std;
+ #if defined(HAVE_ISNAN)
+ 	return isnan (d);
+ #else
+@@ -402,6 +400,7 @@
+ 
+     static MICO_Boolean is_infinityl (MICO_LongDouble d)
+     {
++        using namespace std;
+ #if defined(HAVE_ISINFL)
+ 	return isinfl (d);
+ #elif defined(HAVE_ISINF)
+@@ -413,6 +412,7 @@
+ 
+     static MICO_Boolean is_nanl (MICO_LongDouble d)
+     {
++        using namespace std;
+ #if defined(HAVE_ISNANL)
+ 	return isnanl (d);
+ #elif defined(HAVE_ISNAN)

+ 1 - 1
mico/mico.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        System
 License:      LGPL/GPL
 Version:      2.3.10
-Release:      20030630
+Release:      20030702
 
 #   package options
 %option       with_ssl      no