diff options
author | Martin Jambor <mjambor@suse.cz> | 2017-07-31 14:43:24 +0200 |
---|---|---|
committer | Martin Jambor <mjambor@suse.cz> | 2017-07-31 14:43:24 +0200 |
commit | b32f12dece884f1fa0f04c643a77105aff6ce8bc (patch) | |
tree | cdab5f10806561fc198f907299b0e55eb5701ef0 /libstdc++-v3/include/bits/algorithmfwd.h | |
parent | 166bec868d991fdf71f9a66f994e5977fcab4aa2 (diff) | |
parent | a168a775e93ec31ae743ad282d8e60fa1c116891 (diff) | |
download | gcc-b32f12dece884f1fa0f04c643a77105aff6ce8bc.tar.gz |
Merge branch 'master' into gcngcn
Diffstat (limited to 'libstdc++-v3/include/bits/algorithmfwd.h')
-rw-r--r-- | libstdc++-v3/include/bits/algorithmfwd.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/algorithmfwd.h b/libstdc++-v3/include/bits/algorithmfwd.h index 3ff4ff71230..673b98e7867 100644 --- a/libstdc++-v3/include/bits/algorithmfwd.h +++ b/libstdc++-v3/include/bits/algorithmfwd.h @@ -615,8 +615,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _FIter upper_bound(_FIter, _FIter, const _Tp&, _Compare); -_GLIBCXX_END_NAMESPACE_VERSION - _GLIBCXX_BEGIN_NAMESPACE_ALGO template<typename _FIter> @@ -845,6 +843,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO unique_copy(_IIter, _IIter, _OIter, _BinaryPredicate); _GLIBCXX_END_NAMESPACE_ALGO +_GLIBCXX_END_NAMESPACE_VERSION } // namespace std #ifdef _GLIBCXX_PARALLEL |