From 9e32606c77ae74e133e07d2c1e6b028ff139caac Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Wed, 4 Sep 2019 16:17:00 -0700 Subject: [PATCH] Avoid C++14 ism --- bitcoin/test/miniscript_tests.cpp | 2 +- compiler.cpp | 2 +- js_bindings.cpp | 2 +- main.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bitcoin/test/miniscript_tests.cpp b/bitcoin/test/miniscript_tests.cpp index a560d25..93217c7 100644 --- a/bitcoin/test/miniscript_tests.cpp +++ b/bitcoin/test/miniscript_tests.cpp @@ -237,7 +237,7 @@ const KeyConverter CONVERTER{}; using NodeType = miniscript::NodeType; using NodeRef = miniscript::NodeRef; template NodeRef MakeNodeRef(Args&&... args) { return miniscript::MakeNodeRef(std::forward(args)...); } -using miniscript::operator""_mst; +using miniscript::operator"" _mst; //! Determine whether a Miniscript node is satisfiable at all (and thus isn't equivalent to just "false"). bool Satisfiable(const NodeRef& ref) { diff --git a/compiler.cpp b/compiler.cpp index 018b3c7..c925b85 100644 --- a/compiler.cpp +++ b/compiler.cpp @@ -20,7 +20,7 @@ namespace { using Node = miniscript::NodeRef; using NodeType = miniscript::NodeType; -using miniscript::operator""_mst; +using miniscript::operator"" _mst; template Node MakeNode(Args&&... args) { return miniscript::MakeNodeRef(std::forward(args)...); } diff --git a/js_bindings.cpp b/js_bindings.cpp index b0ec2c2..15bc9b4 100644 --- a/js_bindings.cpp +++ b/js_bindings.cpp @@ -6,7 +6,7 @@ namespace { -using miniscript::operator""_mst; +using miniscript::operator"" _mst; void Output(const std::string& str, char* out, int outlen) { int maxlen = std::min(outlen - 1, str.size()); diff --git a/main.cpp b/main.cpp index 243c2ee..47eee56 100644 --- a/main.cpp +++ b/main.cpp @@ -8,7 +8,7 @@ #include "compiler.h" -using miniscript::operator""_mst; +using miniscript::operator"" _mst; static bool run(std::string&& line, int64_t count) { if (line.size() && line.back() == '\n') line.pop_back();