diff options
| author | rus <rus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-10-03 02:17:41 +0000 |
|---|---|---|
| committer | rus <rus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-10-03 02:17:41 +0000 |
| commit | c55dc904bf82da75f1a76a6523c4e8ff16352b4f (patch) | |
| tree | 4ee10967bd743d512cc41a7b4610019f4ca6adfb /libstdc++-v3/include/bits/c++config | |
| parent | fb5d6a4fa9aec18d9dda9b4d568d0e2be87a34ef (diff) | |
| download | ppe42-gcc-c55dc904bf82da75f1a76a6523c4e8ff16352b4f.tar.gz ppe42-gcc-c55dc904bf82da75f1a76a6523c4e8ff16352b4f.zip | |
merge branch profile-stdlib
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@152431 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/c++config')
| -rw-r--r-- | libstdc++-v3/include/bits/c++config | 40 |
1 files changed, 36 insertions, 4 deletions
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index d5babc31959..724f373ebae 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -85,11 +85,17 @@ # define _GLIBCXX_NAMESPACE_ASSOCIATION_PARALLEL 1 #endif +// Namespace association for profile +#ifdef _GLIBCXX_PROFILE +# define _GLIBCXX_NAMESPACE_ASSOCIATION_PROFILE 1 +#endif + #define _GLIBCXX_NAMESPACE_ASSOCIATION_VERSION // Defined if any namespace association modes are active. #if _GLIBCXX_NAMESPACE_ASSOCIATION_DEBUG \ || _GLIBCXX_NAMESPACE_ASSOCIATION_PARALLEL \ + || _GLIBCXX_NAMESPACE_ASSOCIATION_PROFILE \ || _GLIBCXX_NAMESPACE_ASSOCIATION_VERSION # define _GLIBCXX_USE_NAMESPACE_ASSOCIATION 1 #endif @@ -108,6 +114,7 @@ #ifndef _GLIBCXX_USE_NAMESPACE_ASSOCIATION # define _GLIBCXX_STD_D _GLIBCXX_STD # define _GLIBCXX_STD_P _GLIBCXX_STD +# define _GLIBCXX_STD_PR _GLIBCXX_STD # define _GLIBCXX_STD std # define _GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y) _GLIBCXX_BEGIN_NAMESPACE(X) # define _GLIBCXX_END_NESTED_NAMESPACE _GLIBCXX_END_NAMESPACE @@ -124,7 +131,7 @@ # endif // debug -# if _GLIBCXX_NAMESPACE_ASSOCIATION_DEBUG && !_GLIBCXX_NAMESPACE_ASSOCIATION_PARALLEL +# if _GLIBCXX_NAMESPACE_ASSOCIATION_DEBUG && !_GLIBCXX_NAMESPACE_ASSOCIATION_PARALLEL && !_GLIBCXX_NAMESPACE_ASSOCIATION_PROFILE # define _GLIBCXX_STD_D __norm # define _GLIBCXX_STD_P _GLIBCXX_STD # define _GLIBCXX_STD __cxx1998 @@ -134,7 +141,7 @@ # endif // parallel -# if _GLIBCXX_NAMESPACE_ASSOCIATION_PARALLEL && !_GLIBCXX_NAMESPACE_ASSOCIATION_DEBUG +# if _GLIBCXX_NAMESPACE_ASSOCIATION_PARALLEL && !_GLIBCXX_NAMESPACE_ASSOCIATION_DEBUG && !_GLIBCXX_NAMESPACE_ASSOCIATION_PROFILE # define _GLIBCXX_STD_D _GLIBCXX_STD # define _GLIBCXX_STD_P __norm # define _GLIBCXX_STD __cxx1998 @@ -144,7 +151,7 @@ # endif // debug + parallel -# if _GLIBCXX_NAMESPACE_ASSOCIATION_PARALLEL && _GLIBCXX_NAMESPACE_ASSOCIATION_DEBUG +# if _GLIBCXX_NAMESPACE_ASSOCIATION_PARALLEL && _GLIBCXX_NAMESPACE_ASSOCIATION_DEBUG && !_GLIBCXX_NAMESPACE_ASSOCIATION_PROFILE # define _GLIBCXX_STD_D __norm # define _GLIBCXX_STD_P __norm # define _GLIBCXX_STD __cxx1998 @@ -153,6 +160,21 @@ # define _GLIBCXX_EXTERN_TEMPLATE -1 # endif +// profile +# if _GLIBCXX_NAMESPACE_ASSOCIATION_PROFILE +# if _GLIBCXX_NAMESPACE_ASSOCIATION_PARALLEL || _GLIBCXX_NAMESPACE_ASSOCIATION_DEBUG +# error Cannot use -D_GLIBCXX_PROFILE with -D_GLIBCXX_DEBUG or \ + -D_GLIBCXX_PARALLEL +# endif +# define _GLIBCXX_STD_D __norm +# define _GLIBCXX_STD_P _GLIBCXX_STD +# define _GLIBCXX_STD_PR __norm +# define _GLIBCXX_STD __cxx1998 +# define _GLIBCXX_BEGIN_NAMESPACE(X) namespace X _GLIBCXX_VISIBILITY_ATTR(default) { +# define _GLIBCXX_END_NAMESPACE } +# define _GLIBCXX_EXTERN_TEMPLATE -1 +# endif + # if __NO_INLINE__ && !__GXX_WEAK__ # warning currently using namespace associated mode which may fail \ without inlining due to lack of weak symbols @@ -163,7 +185,7 @@ #endif // Namespace associations for debug mode. -#if _GLIBCXX_NAMESPACE_ASSOCIATION_DEBUG +#if _GLIBCXX_NAMESPACE_ASSOCIATION_DEBUG && !_GLIBCXX_NAMESPACE_ASSOCIATION_PROFILE namespace std { namespace __norm { } @@ -182,6 +204,16 @@ namespace std } #endif +// Namespace associations for profile mode +#if _GLIBCXX_NAMESPACE_ASSOCIATION_PROFILE +namespace std +{ + namespace __norm { } + inline namespace __profile { } + inline namespace __cxx1998 { } +} +#endif + // Namespace associations for versioning mode. #if _GLIBCXX_NAMESPACE_ASSOCIATION_VERSION namespace std |
