Browse Source

Avoid C++14 ism

master
Pieter Wuille 5 years ago
parent
commit
9e32606c77
  1. 2
      bitcoin/test/miniscript_tests.cpp
  2. 2
      compiler.cpp
  3. 2
      js_bindings.cpp
  4. 2
      main.cpp

2
bitcoin/test/miniscript_tests.cpp

@ -237,7 +237,7 @@ const KeyConverter CONVERTER{};
using NodeType = miniscript::NodeType;
using NodeRef = miniscript::NodeRef<CPubKey>;
template<typename... Args> NodeRef MakeNodeRef(Args&&... args) { return miniscript::MakeNodeRef<CPubKey>(std::forward<Args>(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) {

2
compiler.cpp

@ -20,7 +20,7 @@ namespace {
using Node = miniscript::NodeRef<std::string>;
using NodeType = miniscript::NodeType;
using miniscript::operator""_mst;
using miniscript::operator"" _mst;
template<typename... Args>
Node MakeNode(Args&&... args) { return miniscript::MakeNodeRef<std::string>(std::forward<Args>(args)...); }

2
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<int>(outlen - 1, str.size());

2
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();

Loading…
Cancel
Save