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/bits/unordered_map.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/bits/unordered_map.h')
| -rw-r--r-- | libstdc++-v3/include/bits/unordered_map.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/unordered_map.h b/libstdc++-v3/include/bits/unordered_map.h index 4ef30ccccd6..df1302c80c0 100644 --- a/libstdc++-v3/include/bits/unordered_map.h +++ b/libstdc++-v3/include/bits/unordered_map.h @@ -32,6 +32,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_CONTAINER /// Base types for unordered_map. @@ -1911,7 +1912,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER #if __cplusplus > 201402L -_GLIBCXX_BEGIN_NAMESPACE_VERSION // Allow std::unordered_map access to internals of compatible maps. template<typename _Key, typename _Val, typename _Hash1, typename _Eq1, typename _Alloc, typename _Hash2, typename _Eq2> @@ -1959,9 +1959,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _S_get_table(unordered_multimap<_Key, _Val, _Hash2, _Eq2, _Alloc>& __map) { return __map._M_h; } }; -_GLIBCXX_END_NAMESPACE_VERSION #endif // C++17 +_GLIBCXX_END_NAMESPACE_VERSION } // namespace std #endif /* _UNORDERED_MAP_H */ |