Swiftdiff options
| author | Tobias Markmann <tobias.markmann@isode.com> | 2019-11-14 21:08:53 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tobias.markmann@isode.com> | 2019-11-15 11:58:11 (GMT) |
| commit | 8230b23238b4d0ef0fcde01a799758558d502fa1 (patch) | |
| tree | 849251b42e457357b86a2ba91e9b78f635cc55a3 /3rdParty/CppUnit/src/include/cppunit/config/config-msvc6.h | |
| parent | caca46ceedddd43c707e7eda9b4c765d61730ccb (diff) | |
| download | swift-8230b23238b4d0ef0fcde01a799758558d502fa1.zip swift-8230b23238b4d0ef0fcde01a799758558d502fa1.tar.bz2 | |
Update 3rdParty/CppUnit to version 1.14.0
This gets rid of std::auto_ptr usage and its deprecation
warnings.
Test-Information:
Builds and tests pass on macOS.
Change-Id: I299a0a8d9aa2ead15c933e83a2e3e53f84a4f5b7
Diffstat (limited to '3rdParty/CppUnit/src/include/cppunit/config/config-msvc6.h')
| -rw-r--r-- | 3rdParty/CppUnit/src/include/cppunit/config/config-msvc6.h | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/3rdParty/CppUnit/src/include/cppunit/config/config-msvc6.h b/3rdParty/CppUnit/src/include/cppunit/config/config-msvc6.h index d688171..0edc059 100644 --- a/3rdParty/CppUnit/src/include/cppunit/config/config-msvc6.h +++ b/3rdParty/CppUnit/src/include/cppunit/config/config-msvc6.h | |||
| @@ -30,20 +30,6 @@ | |||
| 30 | #define CPPUNIT_HAVE_NAMESPACES 1 | 30 | #define CPPUNIT_HAVE_NAMESPACES 1 |
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
| 33 | /* define if the compiler supports Run-Time Type Identification */ | ||
| 34 | #ifndef CPPUNIT_HAVE_RTTI | ||
| 35 | # ifdef _CPPRTTI // Defined by the compiler option /GR | ||
| 36 | # define CPPUNIT_HAVE_RTTI 1 | ||
| 37 | # else | ||
| 38 | # define CPPUNIT_HAVE_RTTI 0 | ||
| 39 | # endif | ||
| 40 | #endif | ||
| 41 | |||
| 42 | /* Define to 1 to use type_info::name() for class names */ | ||
| 43 | #ifndef CPPUNIT_USE_TYPEINFO_NAME | ||
| 44 | #define CPPUNIT_USE_TYPEINFO_NAME CPPUNIT_HAVE_RTTI | ||
| 45 | #endif | ||
| 46 | |||
| 47 | #define CPPUNIT_HAVE_SSTREAM 1 | 33 | #define CPPUNIT_HAVE_SSTREAM 1 |
| 48 | 34 | ||
| 49 | /* Name of package */ | 35 | /* Name of package */ |
| @@ -73,11 +59,12 @@ | |||
| 73 | // Uncomment to turn on STL wrapping => use this to test compilation. | 59 | // Uncomment to turn on STL wrapping => use this to test compilation. |
| 74 | // This will make CppUnit subclass std::vector & co to provide default | 60 | // This will make CppUnit subclass std::vector & co to provide default |
| 75 | // parameter. | 61 | // parameter. |
| 76 | /*#define CPPUNIT_STD_NEED_ALLOCATOR 1 | 62 | /*#define CPPUNIT_NO_NAMESPACE 1 |
| 77 | #define CPPUNIT_STD_ALLOCATOR std::allocator<T> | ||
| 78 | //#define CPPUNIT_NO_NAMESPACE 1 | ||
| 79 | */ | 63 | */ |
| 80 | 64 | ||
| 65 | #if _MSC_VER >= 1300 // VS 7.0 | ||
| 66 | #define CPPUNIT_UNIQUE_COUNTER __COUNTER__ | ||
| 67 | #endif // if _MSC_VER >= 1300 // VS 7.0 | ||
| 81 | 68 | ||
| 82 | /* _INCLUDE_CPPUNIT_CONFIG_MSVC6_H */ | 69 | /* _INCLUDE_CPPUNIT_CONFIG_MSVC6_H */ |
| 83 | #endif | 70 | #endif |