patches/gcc/4.2.0/220-libstdc++-namespace.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed May 20 20:13:13 2009 +0000 (2009-05-20)
changeset 1345 27fec561af53
parent 111 2e16b9fc302d
permissions -rw-r--r--
Merge the uClinux/noMMU stuff back to /trunk:
- merge Linux and uClinux back to a single kernel
- add ARCH_USE_MMU and acquainted config options that
architectures can auto-select
- make binutils and elf2flt two "Binary utilities" that
go in a single common sub-{menu,directory} structure

-------- diffstat follows --------
/trunk/scripts/build/kernel/uclinux.sh | 2 0 2 0 -
/trunk/scripts/build/kernel/linux.sh | 206 204 2 0 +++++++++++++++++++++++++++++
/trunk/scripts/build/kernel/linux-common.sh | 198 0 198 0 ----------------------------
/trunk/scripts/build/binutils.sh | 232 0 232 0 --------------------------------
/trunk/scripts/build/elf2flt.sh | 150 0 150 0 ---------------------
/trunk/scripts/crosstool-NG.sh.in | 6 4 2 0 +
/trunk/config/kernel/linux.in | 249 249 0 0 +++++++++++++++++++++++++++++++++++
/trunk/config/kernel/linux.in-common | 252 0 252 0 -----------------------------------
/trunk/config/kernel/uclinux.in | 21 0 21 0 ---
/trunk/config/target.in | 23 22 1 0 +++
/trunk/config/elf2flt.in | 49 0 49 0 -------
/trunk/config/libc/glibc.in | 2 1 1 0
/trunk/config/libc/eglibc.in | 2 1 1 0
/trunk/config/config.in | 1 0 1 0 -
/trunk/config/arch/sh.in | 1 1 0 0 +
/trunk/config/arch/arm.in | 2 1 1 0
/trunk/config/arch/powerpc.in | 1 1 0 0 +
/trunk/config/arch/ia64.in | 1 1 0 0 +
/trunk/config/arch/alpha.in | 1 1 0 0 +
/trunk/config/arch/x86.in | 1 1 0 0 +
/trunk/config/arch/mips.in | 1 1 0 0 +
/trunk/config/arch/powerpc64.in | 1 1 0 0 +
22 files changed, 489 insertions(+), 913 deletions(-)
yann@111
     1
diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h
yann@111
     2
--- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-12-22 13:06:56.000000000 +0100
yann@111
     3
+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-12-22 15:23:41.000000000 +0100
yann@111
     4
@@ -32,7 +32,8 @@
yann@111
     5
 //
yann@111
     6
 
yann@111
     7
 // Written by Benjamin Kosnik <bkoz@redhat.com>
yann@111
     8
-
yann@111
     9
+namespace std
yann@111
    10
+{
yann@111
    11
 #ifdef __UCLIBC_MJN3_ONLY__
yann@111
    12
 #warning fix prototypes for *textdomain funcs
yann@111
    13
 #endif
yann@111
    14
@@ -115,3 +116,4 @@
yann@111
    15
 	   this->_S_create_c_locale(this->_M_c_locale_messages, __s); 
yann@111
    16
 	 }
yann@111
    17
      }
yann@111
    18
+}
yann@111
    19
diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h
yann@111
    20
--- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h	2006-12-22 13:06:56.000000000 +0100
yann@111
    21
+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h	2006-12-22 15:20:31.000000000 +0100
yann@111
    22
@@ -33,7 +33,8 @@
yann@111
    23
 //
yann@111
    24
 
yann@111
    25
 // Written by Benjamin Kosnik <bkoz@redhat.com>
yann@111
    26
-
yann@111
    27
+namespace std
yann@111
    28
+{
yann@111
    29
   template<typename _CharT>
yann@111
    30
     __timepunct<_CharT>::__timepunct(size_t __refs) 
yann@111
    31
     : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 
yann@111
    32
@@ -74,3 +75,4 @@
yann@111
    33
       delete _M_data; 
yann@111
    34
       _S_destroy_c_locale(_M_c_locale_timepunct); 
yann@111
    35
     }
yann@111
    36
+}