patches/gcc/4.2.4/220-libstdc++-namespace.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Dec 31 18:47:37 2011 +0100 (2011-12-31)
changeset 2829 0c3c95f911ec
parent 687 b2b6b1d46aa1
permissions -rw-r--r--
docs: credit Konrad EISELE for the initial multilib support

Konrad submitted an initial patch adding multlib support:
http://sourceware.org/ml/crossgcc/2011-11/msg00040.html

The patch was full of good ideas, but had a few issues, so
I (Yann E. MORIN) started it all from scatch, re-using part
of the original patch. This got implemented in this series:
hg log -r 446a17b5dd1e:e47d17391ae3

As I forgot to credit Konrad in these changelogs, update the
docs so that the work by Konrad gets credited. Without his
initial effort, we would probably not have had multlib support
so soon. Thank you Konrad!

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
+}