diff --git a/src/test/jtx/TestHelpers.h b/src/test/jtx/TestHelpers.h index 1ef83bd61b..edda769b27 100644 --- a/src/test/jtx/TestHelpers.h +++ b/src/test/jtx/TestHelpers.h @@ -43,7 +43,7 @@ namespace jtx { */ template < class SField, - class StoredValue = SField::type::value_type, + class StoredValue = typename SField::type::value_type, class OutputValue = StoredValue> struct JTxField { @@ -168,8 +168,8 @@ template struct JTxFieldWrapper { using JF = JTxField; - using SF = JF::SF; - using SV = JF::SV; + using SF = typename JF::SF; + using SV = typename JF::SV; protected: SF const& sfield_; @@ -221,7 +221,7 @@ public: } }; -template +template using simpleField = JTxFieldWrapper>; // TODO We only need this long "requires" clause as polyfill, for C++20 diff --git a/src/xrpld/app/tx/detail/InvariantCheck.cpp b/src/xrpld/app/tx/detail/InvariantCheck.cpp index a74e4eb63e..cb5073ee72 100644 --- a/src/xrpld/app/tx/detail/InvariantCheck.cpp +++ b/src/xrpld/app/tx/detail/InvariantCheck.cpp @@ -78,8 +78,10 @@ checkMyPrivilege(STTx const& tx, Privilege priv) switch (tx.getTxnType()) { #include + // Deprecated types + default: + return false; } - return false; }; #undef TRANSACTION