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/std/numeric | |
| parent | 166bec868d991fdf71f9a66f994e5977fcab4aa2 (diff) | |
| parent | a168a775e93ec31ae743ad282d8e60fa1c116891 (diff) | |
| download | gcc-gcn.tar.gz | |
Merge branch 'master' into gcngcn
Diffstat (limited to 'libstdc++-v3/include/std/numeric')
| -rw-r--r-- | libstdc++-v3/include/std/numeric | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libstdc++-v3/include/std/numeric b/libstdc++-v3/include/std/numeric index c7abbc1b681..17d629db81d 100644 --- a/libstdc++-v3/include/std/numeric +++ b/libstdc++-v3/include/std/numeric @@ -79,10 +79,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { -namespace __detail -{ _GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace __detail +{ // std::abs is not constexpr and doesn't support unsigned integers. template<typename _Tp> constexpr @@ -117,11 +117,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * __detail::__abs_integral(__n) : 0; } - -_GLIBCXX_END_NAMESPACE_VERSION -} - -_GLIBCXX_BEGIN_NAMESPACE_VERSION +} // namespace __detail #if __cplusplus > 201402L |