External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix module test odr violations (#2414)

Browse Source
This commit is contained in:
Cameron DaCamara 2021-07-17 09:16:49 -07:00 committed by GitHub
parent 2038bf6183
commit 00235d8a99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/gtest-extra.h
View File

@ -12,7 +12,12 @@
#include <string> #include <string>
#ifdef FMT_MODULE_TEST
import fmt;
#else
#include "fmt/os.h" #include "fmt/os.h"
#endif // FMG_MODULE_TEST
#include "gmock/gmock.h" #include "gmock/gmock.h"
#define FMT_TEST_THROW_(statement, expected_exception, expected_message, fail) \ #define FMT_TEST_THROW_(statement, expected_exception, expected_message, fail) \

2
test/module-test.cc
View File

@ -15,6 +15,8 @@
# define FMT_HIDE_MODULE_BUGS # define FMT_HIDE_MODULE_BUGS
#endif #endif
#define FMT_MODULE_TEST
#include <bit> #include <bit>
#include <chrono> #include <chrono>
#include <exception> #include <exception>

4
test/util.h
View File

@ -10,7 +10,11 @@
#include <locale> #include <locale>
#include <string> #include <string>
#ifdef FMT_MODULE_TEST
import fmt;
#else
#include "fmt/os.h" #include "fmt/os.h"
#endif // FMT_MODULE_TEST
#ifdef _MSC_VER #ifdef _MSC_VER
# define FMT_VSNPRINTF vsprintf_s # define FMT_VSNPRINTF vsprintf_s