Swiftdiff options
Diffstat (limited to '3rdParty/CppUnit/src/include/cppunit/Portability.h')
| -rw-r--r-- | 3rdParty/CppUnit/src/include/cppunit/Portability.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/3rdParty/CppUnit/src/include/cppunit/Portability.h b/3rdParty/CppUnit/src/include/cppunit/Portability.h index ddf0316..d7c4c11 100644 --- a/3rdParty/CppUnit/src/include/cppunit/Portability.h +++ b/3rdParty/CppUnit/src/include/cppunit/Portability.h | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | // Version number of package | 21 | // Version number of package |
| 22 | #ifndef CPPUNIT_VERSION | 22 | #ifndef CPPUNIT_VERSION |
| 23 | #define CPPUNIT_VERSION "1.12.0" | 23 | #define CPPUNIT_VERSION "1.14.0" |
| 24 | #endif | 24 | #endif |
| 25 | 25 | ||
| 26 | #include <cppunit/config/CppUnitApi.h> // define CPPUNIT_API & CPPUNIT_NEED_DLL_DECL | 26 | #include <cppunit/config/CppUnitApi.h> // define CPPUNIT_API & CPPUNIT_NEED_DLL_DECL |
| @@ -61,20 +61,6 @@ | |||
| 61 | # endif // !defined(CPPUNIT_NO_STD_NAMESPACE) | 61 | # endif // !defined(CPPUNIT_NO_STD_NAMESPACE) |
| 62 | #endif // !defined(CPPUNIT_HAVE_NAMESPACES) | 62 | #endif // !defined(CPPUNIT_HAVE_NAMESPACES) |
| 63 | 63 | ||
| 64 | /* Define CPPUNIT_STD_NEED_ALLOCATOR to 1 if you need to specify | ||
| 65 | * the allocator you used when instantiating STL container. Typically | ||
| 66 | * used for compilers that do not support template default parameter. | ||
| 67 | * CPPUNIT_STD_ALLOCATOR will be used as the allocator. Default is | ||
| 68 | * std::allocator. On some compilers, you may need to change this to | ||
| 69 | * std::allocator<T>. | ||
| 70 | */ | ||
| 71 | #if CPPUNIT_STD_NEED_ALLOCATOR | ||
| 72 | # if !defined(CPPUNIT_STD_ALLOCATOR) | ||
| 73 | # define CPPUNIT_STD_ALLOCATOR std::allocator | ||
| 74 | # endif // !defined(CPPUNIT_STD_ALLOCATOR) | ||
| 75 | #endif // defined(CPPUNIT_STD_NEED_ALLOCATOR) | ||
| 76 | |||
| 77 | |||
| 78 | // Compiler error location format for CompilerOutputter | 64 | // Compiler error location format for CompilerOutputter |
| 79 | // If not define, assumes that it's gcc | 65 | // If not define, assumes that it's gcc |
| 80 | // See class CompilerOutputter for format. | 66 | // See class CompilerOutputter for format. |
| @@ -162,11 +148,17 @@ | |||
| 162 | /// \internal | 148 | /// \internal |
| 163 | #define _CPPUNIT_DO_JOIN2( symbol1, symbol2 ) symbol1##symbol2 | 149 | #define _CPPUNIT_DO_JOIN2( symbol1, symbol2 ) symbol1##symbol2 |
| 164 | 150 | ||
| 151 | /// \internal Unique suffix for variable name. Can be overridden in platform specific | ||
| 152 | /// config-*.h. Default to line number. | ||
| 153 | #ifndef CPPUNIT_UNIQUE_COUNTER | ||
| 154 | # define CPPUNIT_UNIQUE_COUNTER __LINE__ | ||
| 155 | #endif | ||
| 156 | |||
| 165 | /*! Adds the line number to the specified string to create a unique identifier. | 157 | /*! Adds the line number to the specified string to create a unique identifier. |
| 166 | * \param prefix Prefix added to the line number to create a unique identifier. | 158 | * \param prefix Prefix added to the line number to create a unique identifier. |
| 167 | * \see CPPUNIT_TEST_SUITE_REGISTRATION for an example of usage. | 159 | * \see CPPUNIT_TEST_SUITE_REGISTRATION for an example of usage. |
| 168 | */ | 160 | */ |
| 169 | #define CPPUNIT_MAKE_UNIQUE_NAME( prefix ) CPPUNIT_JOIN( prefix, __LINE__ ) | 161 | #define CPPUNIT_MAKE_UNIQUE_NAME( prefix ) CPPUNIT_JOIN( prefix, CPPUNIT_UNIQUE_COUNTER ) |
| 170 | 162 | ||
| 171 | /*! Defines wrap colunm for %CppUnit. Used by CompilerOuputter. | 163 | /*! Defines wrap colunm for %CppUnit. Used by CompilerOuputter. |
| 172 | */ | 164 | */ |