Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame^] | 1 | From 104e4d66208f2726b14d2f5eebce90700cbc83c8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 29 Mar 2013 08:54:02 +0400 |
| 4 | Subject: [PATCH 13/35] libstdc++-namespace |
| 5 | |
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | --- |
| 10 | libstdc++-v3/config/locale/uclibc/messages_members.h | 4 +++- |
| 11 | libstdc++-v3/config/locale/uclibc/time_members.h | 4 +++- |
| 12 | 2 files changed, 6 insertions(+), 2 deletions(-) |
| 13 | |
| 14 | diff --git a/libstdc++-v3/config/locale/uclibc/messages_members.h b/libstdc++-v3/config/locale/uclibc/messages_members.h |
| 15 | index 067657a..dd76a6c 100644 |
| 16 | --- a/libstdc++-v3/config/locale/uclibc/messages_members.h |
| 17 | +++ b/libstdc++-v3/config/locale/uclibc/messages_members.h |
| 18 | @@ -32,7 +32,8 @@ |
| 19 | // |
| 20 | |
| 21 | // Written by Benjamin Kosnik <bkoz@redhat.com> |
| 22 | - |
| 23 | +namespace std |
| 24 | +{ |
| 25 | #ifdef __UCLIBC_MJN3_ONLY__ |
| 26 | #warning fix prototypes for *textdomain funcs |
| 27 | #endif |
| 28 | @@ -116,3 +117,4 @@ |
| 29 | this->_S_create_c_locale(this->_M_c_locale_messages, __s); |
| 30 | } |
| 31 | } |
| 32 | +} |
| 33 | diff --git a/libstdc++-v3/config/locale/uclibc/time_members.h b/libstdc++-v3/config/locale/uclibc/time_members.h |
| 34 | index 1665dde..905c433 100644 |
| 35 | --- a/libstdc++-v3/config/locale/uclibc/time_members.h |
| 36 | +++ b/libstdc++-v3/config/locale/uclibc/time_members.h |
| 37 | @@ -33,7 +33,8 @@ |
| 38 | // |
| 39 | |
| 40 | // Written by Benjamin Kosnik <bkoz@redhat.com> |
| 41 | - |
| 42 | +namespace std |
| 43 | +{ |
| 44 | template<typename _CharT> |
| 45 | __timepunct<_CharT>::__timepunct(size_t __refs) |
| 46 | : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), |
| 47 | @@ -75,3 +76,4 @@ |
| 48 | delete _M_data; |
| 49 | _S_destroy_c_locale(_M_c_locale_timepunct); |
| 50 | } |
| 51 | +} |
| 52 | -- |
| 53 | 1.7.10.4 |
| 54 | |