Adapt to changes in c++utilities

This commit is contained in:
Martchus 2019-06-12 21:02:09 +02:00
parent b323460dbb
commit a2772506a3
2 changed files with 3 additions and 3 deletions

View File

@ -10,8 +10,8 @@
#define PASSWORD_FILE_EXPORT #define PASSWORD_FILE_EXPORT
#define PASSWORD_FILE_IMPORT #define PASSWORD_FILE_IMPORT
#else #else
#define PASSWORD_FILE_EXPORT LIB_EXPORT #define PASSWORD_FILE_EXPORT CPP_UTILITIES_GENERIC_LIB_EXPORT
#define PASSWORD_FILE_IMPORT LIB_IMPORT #define PASSWORD_FILE_IMPORT CPP_UTILITIES_GENERIC_LIB_IMPORT
#endif #endif
/*! /*!

View File

@ -190,7 +190,7 @@ void EntryTests::testUniqueLabels()
{ {
NodeEntry root("root"); NodeEntry root("root");
const auto *const fooEntry = new AccountEntry("foo", &root); const auto *const fooEntry = new AccountEntry("foo", &root);
VAR_UNUSED(fooEntry) CPP_UTILITIES_UNUSED(fooEntry)
const auto *const foo2Entry = new AccountEntry("foo", &root); const auto *const foo2Entry = new AccountEntry("foo", &root);
CPPUNIT_ASSERT_EQUAL_MESSAGE("2nd foo renamed to foo 2", "foo 2"s, foo2Entry->label()); CPPUNIT_ASSERT_EQUAL_MESSAGE("2nd foo renamed to foo 2", "foo 2"s, foo2Entry->label());
const auto *const foo3Entry = new AccountEntry("foo", &root); const auto *const foo3Entry = new AccountEntry("foo", &root);