diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-04-14 16:08:34 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2017-04-26 08:27:31 +0000 |
| commit | e1660a18cf2097511c08a62e7af3e19683e3420a (patch) | |
| tree | 58b24e04ffad25296f288f0eae73cc81aceccbb3 /src/libs/3rdparty/cplusplus | |
| parent | 531fba61f0349c6b0eedc3b2e832f76a76c8be94 (diff) | |
Remove workarounds for unsupported compilers
Change-Id: Ie28ff761b0bae13c6ebdf7dd649cfbba28e0fc2c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/libs/3rdparty/cplusplus')
| -rw-r--r-- | src/libs/3rdparty/cplusplus/Parser.cpp | 4 | ||||
| -rw-r--r-- | src/libs/3rdparty/cplusplus/TranslationUnit.cpp | 4 | ||||
| -rw-r--r-- | src/libs/3rdparty/cplusplus/TranslationUnit.h | 21 |
3 files changed, 3 insertions, 26 deletions
diff --git a/src/libs/3rdparty/cplusplus/Parser.cpp b/src/libs/3rdparty/cplusplus/Parser.cpp index b55ac6f18a..8754206a0b 100644 --- a/src/libs/3rdparty/cplusplus/Parser.cpp +++ b/src/libs/3rdparty/cplusplus/Parser.cpp @@ -33,9 +33,7 @@ #include <string> #include <cstdio> // for putchar -#if defined(_MSC_VER) && (_MSC_VER < 1800) -# define va_copy(dst, src) ((dst) = (src)) -#elif defined(__INTEL_COMPILER) && !defined(va_copy) +#if defined(__INTEL_COMPILER) && !defined(va_copy) # define va_copy __va_copy #endif diff --git a/src/libs/3rdparty/cplusplus/TranslationUnit.cpp b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp index 257b2b97c7..2da8ad563e 100644 --- a/src/libs/3rdparty/cplusplus/TranslationUnit.cpp +++ b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp @@ -32,9 +32,7 @@ #include <algorithm> #include <utility> -#if defined(_MSC_VER) && (_MSC_VER < 1800) -# define va_copy(dst, src) ((dst) = (src)) -#elif defined(__INTEL_COMPILER) && !defined(va_copy) +#if defined(__INTEL_COMPILER) && !defined(va_copy) # define va_copy __va_copy #endif diff --git a/src/libs/3rdparty/cplusplus/TranslationUnit.h b/src/libs/3rdparty/cplusplus/TranslationUnit.h index 81605575a5..7def1a65a3 100644 --- a/src/libs/3rdparty/cplusplus/TranslationUnit.h +++ b/src/libs/3rdparty/cplusplus/TranslationUnit.h @@ -25,21 +25,9 @@ #include "Token.h" #include "DiagnosticClient.h" #include <cstdio> +#include <unordered_map> #include <vector> -#if !(__cplusplus > 199711L || __GXX_EXPERIMENTAL_CXX0X__ || _MSC_VER >= 1600 || defined( _LIBCPP_VERSION )) \ - || (defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)) -#define USE_TR1 -#endif - -#if defined(_MSC_VER) && _MSC_VER < 1600 -# include <map> -#elif defined(USE_TR1) -# include <tr1/unordered_map> -#else -# include <unordered_map> -#endif - namespace CPlusPlus { class CPLUSPLUS_EXPORT TranslationUnit @@ -185,14 +173,7 @@ private: std::vector<Token> *_comments; std::vector<unsigned> _lineOffsets; std::vector<PPLine> _ppLines; -#if defined(_MSC_VER) && _MSC_VER < 1600 - // MSVC2008 and earlier do not implement TR1. - typedef std::map<unsigned, std::pair<unsigned, unsigned> > TokenLineColumn; -#elif defined(USE_TR1) - typedef std::tr1::unordered_map<unsigned, std::pair<unsigned, unsigned> > TokenLineColumn; -#else typedef std::unordered_map<unsigned, std::pair<unsigned, unsigned> > TokenLineColumn; -#endif TokenLineColumn _expandedLineColumn; MemoryPool *_pool; AST *_ast; |