diff options
author | Edward Smith-Rowland <3dw4rd@verizon.net> | 2017-08-12 19:09:40 +0000 |
---|---|---|
committer | Edward Smith-Rowland <3dw4rd@verizon.net> | 2017-08-12 19:09:40 +0000 |
commit | 40fa8ee5f9da161462fde48776ef6262366f9a13 (patch) | |
tree | d3c3bf913950c59ef83b8d9ede50b0978ec0c12f /libstdc++-v3/include/tr1/special_function_util.h | |
parent | 3acaf2e51caf356a9afc763cfd70b91d1ab094b5 (diff) |
Merged revisions r232323 through r251067 to the branchtr29124
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/tr29124@251068 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/tr1/special_function_util.h')
-rw-r--r-- | libstdc++-v3/include/tr1/special_function_util.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libstdc++-v3/include/tr1/special_function_util.h b/libstdc++-v3/include/tr1/special_function_util.h index 9d40a16ca6c..c4e9c476150 100644 --- a/libstdc++-v3/include/tr1/special_function_util.h +++ b/libstdc++-v3/include/tr1/special_function_util.h @@ -38,6 +38,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + #if _GLIBCXX_USE_STD_SPEC_FUNCS #elif defined(_GLIBCXX_TR1_CMATH) namespace tr1 @@ -47,8 +49,6 @@ namespace tr1 #endif namespace __detail { - _GLIBCXX_BEGIN_NAMESPACE_VERSION - /// A class to encapsulate type dependent floating point /// constants. Not everything will be able to be expressed as /// type logic. @@ -130,12 +130,12 @@ namespace tr1 { return __builtin_isnanl(__x); } #endif - - _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail #if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH) } // namespace tr1 #endif + +_GLIBCXX_END_NAMESPACE_VERSION } #endif // _GLIBCXX_TR1_SPECIAL_FUNCTION_UTIL_H |