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/manifest-roundtrip | |
| parent | 2a00871f07067f8f9e2de08bb9c8f50e1bf6a650 (diff) | |
Initial modularization with both Clang and VC hacks
Note: gave up on VC about half way though.
Diffstat (limited to 'tests/manifest-roundtrip')
| -rw-r--r-- | tests/manifest-roundtrip/buildfile | 6 | ||||
| -rw-r--r-- | tests/manifest-roundtrip/driver.cxx | 25 |
2 files changed, 27 insertions, 4 deletions
diff --git a/tests/manifest-roundtrip/buildfile b/tests/manifest-roundtrip/buildfile index a2fb3ac..5cd296f 100644 --- a/tests/manifest-roundtrip/buildfile +++ b/tests/manifest-roundtrip/buildfile @@ -4,5 +4,11 @@ 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 exe{driver}: test.roundtrip = manifest diff --git a/tests/manifest-roundtrip/driver.cxx b/tests/manifest-roundtrip/driver.cxx index 2068409..1f0b311 100644 --- a/tests/manifest-roundtrip/driver.cxx +++ b/tests/manifest-roundtrip/driver.cxx @@ -3,12 +3,29 @@ // license : MIT; see accompanying LICENSE file #include <cassert> + +#ifndef __cpp_lib_modules +#include <string> #include <iostream> +#endif + +// Other includes. -#include <libbutl/utility.hxx> // operator<<(ostream, exception) -#include <libbutl/fdstream.hxx> -#include <libbutl/manifest-parser.hxx> -#include <libbutl/manifest-serializer.hxx> +#ifdef __cpp_modules +#ifdef __cpp_lib_modules +import std.core; +import std.io; +#endif +import butl.utility; // operator<<(ostream, exception) +import butl.fdstream; +import butl.manifest_parser; +import butl.manifest_serializer; +#else +#include <libbutl/utility.mxx> +#include <libbutl/fdstream.mxx> +#include <libbutl/manifest-parser.mxx> +#include <libbutl/manifest-serializer.mxx> +#endif using namespace std; using namespace butl; |