Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.2.1/220-libstdc++-namespace.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
parent 313 2f223aafc7cb
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 
     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

     2 --- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h	2007-08-03 20:31:54.000000000 +0200

     3 +++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h	2007-08-03 20:35:40.000000000 +0200

     4 @@ -32,7 +32,8 @@

     5  //

     6  

     7  // Written by Benjamin Kosnik <bkoz@redhat.com>

     8 -

     9 +namespace std

    10 +{

    11  #ifdef __UCLIBC_MJN3_ONLY__

    12  #warning fix prototypes for *textdomain funcs

    13  #endif

    14 @@ -115,3 +116,4 @@

    15  	   this->_S_create_c_locale(this->_M_c_locale_messages, __s); 

    16  	 }

    17       }

    18 +}

    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

    20 --- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h	2007-08-03 20:31:54.000000000 +0200

    21 +++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h	2007-08-03 20:35:40.000000000 +0200

    22 @@ -33,7 +33,8 @@

    23  //

    24  

    25  // Written by Benjamin Kosnik <bkoz@redhat.com>

    26 -

    27 +namespace std

    28 +{

    29    template<typename _CharT>

    30      __timepunct<_CharT>::__timepunct(size_t __refs) 

    31      : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 

    32 @@ -74,3 +75,4 @@

    33        delete _M_data; 

    34        _S_destroy_c_locale(_M_c_locale_timepunct); 

    35      }

    36 +}
crosstool-ng