2016-10-22 François Dumont <fdumont@gcc.gnu.org>
* include/bits/c++config (_GLIBCXX_BEGIN_NAMESPACE_ALGO) (_GLIBCXX_END_NAMESPACE_ALGO): Default to respectively _GLIBCXX_BEGIN_NAMESPACE_VERSION and _GLIBCXX_END_NAMESPACE_VERSION. (_GLIBCXX_BEGIN_NAMESPACE_CONTAINER, _GLIBCXX_END_NAMESPACE_CONTAINER): Likewise. From-SVN: r241445
This commit is contained in:
parent
8c2430bbf8
commit
35518d76b9
2 changed files with 15 additions and 23 deletions
|
@ -1,3 +1,11 @@
|
|||
2016-10-22 François Dumont <fdumont@gcc.gnu.org>
|
||||
|
||||
* include/bits/c++config (_GLIBCXX_BEGIN_NAMESPACE_ALGO)
|
||||
(_GLIBCXX_END_NAMESPACE_ALGO): Default to respectively
|
||||
_GLIBCXX_BEGIN_NAMESPACE_VERSION and _GLIBCXX_END_NAMESPACE_VERSION.
|
||||
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER, _GLIBCXX_END_NAMESPACE_CONTAINER):
|
||||
Likewise.
|
||||
|
||||
2016-10-22 Jonathan Wakely <jwakely@redhat.com>
|
||||
|
||||
* src/filesystem/ops.cc (permissions(const path&, perms, error_code&)):
|
||||
|
|
|
@ -368,6 +368,10 @@ namespace std
|
|||
namespace _GLIBCXX_STD_C { _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
# define _GLIBCXX_END_NAMESPACE_CONTAINER \
|
||||
_GLIBCXX_END_NAMESPACE_VERSION }
|
||||
#else
|
||||
# define _GLIBCXX_STD_C std
|
||||
# define _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
# define _GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_VERSION
|
||||
#endif
|
||||
|
||||
#ifdef _GLIBCXX_PARALLEL
|
||||
|
@ -376,30 +380,10 @@ namespace std
|
|||
namespace _GLIBCXX_STD_A { _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
# define _GLIBCXX_END_NAMESPACE_ALGO \
|
||||
_GLIBCXX_END_NAMESPACE_VERSION }
|
||||
#endif
|
||||
|
||||
#ifndef _GLIBCXX_STD_A
|
||||
#else
|
||||
# define _GLIBCXX_STD_A std
|
||||
#endif
|
||||
|
||||
#ifndef _GLIBCXX_STD_C
|
||||
# define _GLIBCXX_STD_C std
|
||||
#endif
|
||||
|
||||
#ifndef _GLIBCXX_BEGIN_NAMESPACE_ALGO
|
||||
# define _GLIBCXX_BEGIN_NAMESPACE_ALGO
|
||||
#endif
|
||||
|
||||
#ifndef _GLIBCXX_END_NAMESPACE_ALGO
|
||||
# define _GLIBCXX_END_NAMESPACE_ALGO
|
||||
#endif
|
||||
|
||||
#ifndef _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
|
||||
# define _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
|
||||
#endif
|
||||
|
||||
#ifndef _GLIBCXX_END_NAMESPACE_CONTAINER
|
||||
# define _GLIBCXX_END_NAMESPACE_CONTAINER
|
||||
# define _GLIBCXX_BEGIN_NAMESPACE_ALGO _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
# define _GLIBCXX_END_NAMESPACE_ALGO _GLIBCXX_END_NAMESPACE_VERSION
|
||||
#endif
|
||||
|
||||
// GLIBCXX_ABI Deprecated
|
||||
|
|
Loading…
Add table
Reference in a new issue