aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2021-09-28 21:53:32 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2021-09-28 21:53:32 +0300
commit434f7347cbf49e54bac51b4f5c99ba82ebbbe415 (patch)
treeecd8c006339f24e7ccfe866a4d4677a4f741ca4a
parent09078c0cb50163bbacc25e36ac09095694e3ad07 (diff)
Adapt to libbutl headers extension change from .mxx to .hxx
-rw-r--r--openssl/agent/pkcs11/agent.cxx2
-rw-r--r--openssl/agent/pkcs11/pkcs11.cxx2
-rw-r--r--openssl/agent/pkcs11/url.hxx2
-rw-r--r--openssl/client/client.cxx2
-rw-r--r--openssl/diagnostics.hxx2
-rw-r--r--openssl/types.hxx18
-rw-r--r--openssl/utility.hxx12
7 files changed, 20 insertions, 20 deletions
diff --git a/openssl/agent/pkcs11/agent.cxx b/openssl/agent/pkcs11/agent.cxx
index 8655bdf..8d61208 100644
--- a/openssl/agent/pkcs11/agent.cxx
+++ b/openssl/agent/pkcs11/agent.cxx
@@ -15,7 +15,7 @@
#include <iostream> // cout
-#include <libbutl/pager.mxx>
+#include <libbutl/pager.hxx>
#include <openssl/protocol.hxx>
#include <openssl/diagnostics.hxx>
diff --git a/openssl/agent/pkcs11/pkcs11.cxx b/openssl/agent/pkcs11/pkcs11.cxx
index 78e8372..ac7e43a 100644
--- a/openssl/agent/pkcs11/pkcs11.cxx
+++ b/openssl/agent/pkcs11/pkcs11.cxx
@@ -5,7 +5,7 @@
#include <dlfcn.h>
-#include <libbutl/utility.mxx> // function_cast()
+#include <libbutl/utility.hxx> // function_cast()
namespace openssl
{
diff --git a/openssl/agent/pkcs11/url.hxx b/openssl/agent/pkcs11/url.hxx
index 174cef6..04176c0 100644
--- a/openssl/agent/pkcs11/url.hxx
+++ b/openssl/agent/pkcs11/url.hxx
@@ -4,7 +4,7 @@
#ifndef OPENSSL_AGENT_PKCS11_URL_HXX
#define OPENSSL_AGENT_PKCS11_URL_HXX
-#include <libbutl/url.mxx>
+#include <libbutl/url.hxx>
#include <openssl/types.hxx>
#include <openssl/utility.hxx>
diff --git a/openssl/client/client.cxx b/openssl/client/client.cxx
index 4c655aa..2e76f31 100644
--- a/openssl/client/client.cxx
+++ b/openssl/client/client.cxx
@@ -3,7 +3,7 @@
#include <iostream> // cin, cout
-#include <libbutl/pager.mxx>
+#include <libbutl/pager.hxx>
#include <openssl/protocol.hxx>
#include <openssl/diagnostics.hxx>
diff --git a/openssl/diagnostics.hxx b/openssl/diagnostics.hxx
index 248e771..b918c94 100644
--- a/openssl/diagnostics.hxx
+++ b/openssl/diagnostics.hxx
@@ -4,7 +4,7 @@
#ifndef OPENSSL_DIAGNOSTICS_HXX
#define OPENSSL_DIAGNOSTICS_HXX
-#include <libbutl/diagnostics.mxx>
+#include <libbutl/diagnostics.hxx>
#include <openssl/types.hxx> // Note: not <openssl/utility.hxx>.
diff --git a/openssl/types.hxx b/openssl/types.hxx
index 1d584bf..c3a80d2 100644
--- a/openssl/types.hxx
+++ b/openssl/types.hxx
@@ -17,11 +17,11 @@
#include <stdexcept> // logic_error, invalid_argument, runtime_error
#include <system_error>
-#include <libbutl/path.mxx>
-#include <libbutl/path-io.mxx>
-#include <libbutl/optional.mxx>
-#include <libbutl/fdstream.mxx>
-#include <libbutl/small-vector.mxx>
+#include <libbutl/path.hxx>
+#include <libbutl/path-io.hxx>
+#include <libbutl/optional.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/small-vector.hxx>
namespace openssl
{
@@ -45,7 +45,7 @@ namespace openssl
using std::weak_ptr;
using std::vector;
- using butl::small_vector; // <libbutl/small-vector.mxx>
+ using butl::small_vector; // <libbutl/small-vector.hxx>
using strings = vector<string>;
using cstrings = vector<const char*>;
@@ -62,12 +62,12 @@ namespace openssl
using std::system_error;
using io_error = std::ios_base::failure;
- // <libbutl/optional.mxx>
+ // <libbutl/optional.hxx>
//
using butl::optional;
using butl::nullopt;
- // <libbutl/path.mxx>
+ // <libbutl/path.hxx>
//
using butl::path;
using butl::dir_path;
@@ -76,7 +76,7 @@ namespace openssl
using butl::path_cast;
- // <libbutl/fdstream.mxx>
+ // <libbutl/fdstream.hxx>
//
using butl::auto_fd;
using butl::ifdstream;
diff --git a/openssl/utility.hxx b/openssl/utility.hxx
index adbbd67..e78d658 100644
--- a/openssl/utility.hxx
+++ b/openssl/utility.hxx
@@ -8,9 +8,9 @@
#include <utility> // move(), forward(), declval(), make_pair()
#include <cassert> // assert()
-#include <libbutl/utility.mxx> // icasecmp(), reverse_iterate(), etc
-#include <libbutl/fdstream.mxx>
-#include <libbutl/filesystem.mxx>
+#include <libbutl/utility.hxx> // icasecmp(), reverse_iterate(), etc
+#include <libbutl/fdstream.hxx>
+#include <libbutl/filesystem.hxx>
#include <openssl/types.hxx>
#include <openssl/version.hxx>
@@ -24,7 +24,7 @@ namespace openssl
using std::make_pair;
using std::to_string;
- // <libbutl/utility.mxx>
+ // <libbutl/utility.hxx>
//
using butl::ucase;
using butl::lcase;
@@ -50,14 +50,14 @@ namespace openssl
using butl::throw_generic_ios_failure;
using butl::throw_system_ios_failure;
- // <libbutl/filesystem.mxx>
+ // <libbutl/filesystem.hxx>
//
using butl::file_exists;
using butl::auto_rmfile;
using butl::auto_rmdir;
- // <libbutl/fdstream.mxx>
+ // <libbutl/fdstream.hxx>
//
using butl::stdin_fdmode;
using butl::stdout_fdmode;