diff options
| author | Robert Loehning <robert.loehning@qt.io> | 2017-01-19 13:07:26 +0100 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@qt.io> | 2017-01-19 12:21:43 +0000 |
| commit | eeb0b8fd21dba8421bd50b475a6442c27b63a1a6 (patch) | |
| tree | 5e98b54f7dbb41bab5161978540948b62c95f5fd /src/libs/utils/smallstringliteral.h | |
| parent | 5dc8e9a743481b6e7bddacc4d5597760bfc0d045 (diff) | |
Revert "Revert "Utils: Remove old compiler support code""
Thomas provided a smaller fix.
This reverts commit 78fb7f44bf393d8b9e3e22fcccc4ae7951d4bb6e.
Change-Id: I1edff6477526fe4ce29df38852f47fe49117561e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/libs/utils/smallstringliteral.h')
| -rw-r--r-- | src/libs/utils/smallstringliteral.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/libs/utils/smallstringliteral.h b/src/libs/utils/smallstringliteral.h index dacba59d60a..4b7a6ba633c 100644 --- a/src/libs/utils/smallstringliteral.h +++ b/src/libs/utils/smallstringliteral.h @@ -29,16 +29,6 @@ #include "smallstringlayout.h" #include "smallstringview.h" -#pragma push_macro("constexpr") -#ifndef __cpp_constexpr -#define constexpr -#endif - -#pragma push_macro("noexcept") -#ifndef __cpp_noexcept -#define noexcept -#endif - namespace Utils { template <int Size> @@ -129,6 +119,3 @@ private: using SmallStringLiteral = BasicSmallStringLiteral<31>; } // namespace Utils - -#pragma pop_macro("noexcept") -#pragma pop_macro("constexpr") |