patches/gcc/4.2.4/220-libstdc++-namespace.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Mar 28 01:05:18 2011 +0200 (2011-03-28)
changeset 2362 0888065f8c4d
parent 687 b2b6b1d46aa1
permissions -rw-r--r--
cc/gcc: cleanup the _or_later logic

So far, we've had a version always select appropriate _or_later option,
which in turn would select all previous _or_later options.

Because the dependencies on companion libs were cumulative, that was
working OK. But the upcoming 4.6 will no longer depend on libelf, so
we can't keep the cumulative scheme we've been using so far.

Have each release family select the corresponding dependencies, instead
of relying on selecting previous _or_later.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@687
     1
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
yann@687
     2
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h	2007-08-03 20:31:54.000000000 +0200
yann@687
     3
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h	2007-08-03 20:35:40.000000000 +0200
yann@687
     4
@@ -32,7 +32,8 @@
yann@687
     5
 //
yann@687
     6
 
yann@687
     7
 // Written by Benjamin Kosnik <bkoz@redhat.com>
yann@687
     8
-
yann@687
     9
+namespace std
yann@687
    10
+{
yann@687
    11
 #ifdef __UCLIBC_MJN3_ONLY__
yann@687
    12
 #warning fix prototypes for *textdomain funcs
yann@687
    13
 #endif
yann@687
    14
@@ -115,3 +116,4 @@
yann@687
    15
 	   this->_S_create_c_locale(this->_M_c_locale_messages, __s); 
yann@687
    16
 	 }
yann@687
    17
      }
yann@687
    18
+}
yann@687
    19
diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h
yann@687
    20
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h	2007-08-03 20:31:54.000000000 +0200
yann@687
    21
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h	2007-08-03 20:35:40.000000000 +0200
yann@687
    22
@@ -33,7 +33,8 @@
yann@687
    23
 //
yann@687
    24
 
yann@687
    25
 // Written by Benjamin Kosnik <bkoz@redhat.com>
yann@687
    26
-
yann@687
    27
+namespace std
yann@687
    28
+{
yann@687
    29
   template<typename _CharT>
yann@687
    30
     __timepunct<_CharT>::__timepunct(size_t __refs) 
yann@687
    31
     : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 
yann@687
    32
@@ -74,3 +75,4 @@
yann@687
    33
       delete _M_data; 
yann@687
    34
       _S_destroy_c_locale(_M_c_locale_timepunct); 
yann@687
    35
     }
yann@687
    36
+}