diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2017-09-22 23:32:28 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-09-22 23:32:28 +0200 |
commit | c09cd7512491cee1e82c1ad8128ce9fd4bc3f79b (patch) | |
tree | a659ed768d849130ab5780a11b7f791a463a1a91 /tests/timestamp | |
parent | 2a00871f07067f8f9e2de08bb9c8f50e1bf6a650 (diff) |
Initial modularization with both Clang and VC hacks
Note: gave up on VC about half way though.
Diffstat (limited to 'tests/timestamp')
-rw-r--r-- | tests/timestamp/buildfile | 6 | ||||
-rw-r--r-- | tests/timestamp/driver.cxx | 17 |
2 files changed, 21 insertions, 2 deletions
diff --git a/tests/timestamp/buildfile b/tests/timestamp/buildfile index 085daf0..c554fc3 100644 --- a/tests/timestamp/buildfile +++ b/tests/timestamp/buildfile @@ -4,4 +4,10 @@ import libs = libbutl%lib{butl} +if ($cxx.features.modules && ($force_std_modules == true || $cxx.id != 'msvc')) +{ + import libs += libstd-modules%liba{std-modules} + cxx.poptions += -D__cpp_lib_modules +} + exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/timestamp/driver.cxx b/tests/timestamp/driver.cxx index 661deb2..ec4c49d 100644 --- a/tests/timestamp/driver.cxx +++ b/tests/timestamp/driver.cxx @@ -4,15 +4,28 @@ #include <time.h> // tzset() (POSIX), _tzset() (Windows) +#include <cassert> + +#ifndef __cpp_lib_modules #include <chrono> #include <locale> #include <clocale> -#include <cassert> #include <sstream> #include <iomanip> #include <system_error> +#endif -#include <libbutl/timestamp.hxx> +// Other includes. + +#ifdef __cpp_modules +#ifdef __cpp_lib_modules +import std.core; +import std.io; +#endif +import butl.timestamp; +#else +#include <libbutl/timestamp.mxx> +#endif using namespace std; using namespace butl; |