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/experimental/array | |
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/experimental/array')
-rw-r--r-- | libstdc++-v3/include/experimental/array | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libstdc++-v3/include/experimental/array b/libstdc++-v3/include/experimental/array index 11cb924e087..9d758f7d149 100644 --- a/libstdc++-v3/include/experimental/array +++ b/libstdc++-v3/include/experimental/array @@ -40,12 +40,12 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace experimental { inline namespace fundamentals_v2 { -_GLIBCXX_BEGIN_NAMESPACE_VERSION - #define __cpp_lib_experimental_make_array 201505 /** * @defgroup make_array Array creation functions @@ -104,10 +104,10 @@ template <typename _Tp, size_t _Nm> } // @} group make_array - _GLIBCXX_END_NAMESPACE_VERSION } // namespace fundamentals_v2 } // namespace experimental +_GLIBCXX_END_NAMESPACE_VERSION } // namespace std #endif // C++14 |