From c09cd7512491cee1e82c1ad8128ce9fd4bc3f79b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 22 Sep 2017 23:32:28 +0200 Subject: Initial modularization with both Clang and VC hacks Note: gave up on VC about half way though. --- tests/openssl/buildfile | 6 ++++++ tests/openssl/driver.cxx | 28 +++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) (limited to 'tests/openssl') diff --git a/tests/openssl/buildfile b/tests/openssl/buildfile index 7713f14..08b0878 100644 --- a/tests/openssl/buildfile +++ b/tests/openssl/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 test{testscript} diff --git a/tests/openssl/driver.cxx b/tests/openssl/driver.cxx index b0e37ae..092b2ba 100644 --- a/tests/openssl/driver.cxx +++ b/tests/openssl/driver.cxx @@ -2,14 +2,36 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file +#include + +#ifndef __cpp_lib_modules #include #include #include #include +#endif + +// Other includes. + +#ifdef __cpp_modules +#ifdef __cpp_lib_modules +import std.core; +import std.io; +#endif +import butl.path; +import butl.utility; // operator<<(ostream, exception) +import butl.openssl; +import butl.process; +import butl.fdstream; // nullfd -#include -#include // operator<<(ostream, exception) -#include +import butl.optional; // @@ MOD Clang should not be necessary. +import butl.small_vector; // @@ MOD Clang should not be necessary. +#else +#include +#include +#include +#include +#endif using namespace std; using namespace butl; -- cgit v1.1