CLI refactoring

nanocurrency · Jul 9, 2018 · ef86a5e · ef86a5e
1 parent 560c17a
commit ef86a5e
Show file tree

Hide file tree

Showing 8 changed files with 1,009 additions and 956 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -312,6 +312,8 @@ add_library (node
 	${SECURE_RPC_SOURCE}
 	rai/node/bootstrap.cpp
 	rai/node/bootstrap.hpp
+	rai/node/cli.hpp
+	rai/node/cli.cpp
 	rai/node/common.cpp
 	rai/node/common.hpp
 	rai/node/node.hpp

diff --git a/rai/lib/errors.hpp b/rai/lib/errors.hpp
@@ -3,6 +3,7 @@
 #include <rai/lib/expected.hpp>
 #include <string>
 #include <system_error>
+#include <type_traits>
 
 using tl::expected;
 using tl::make_unexpected;
@@ -11,7 +12,7 @@ namespace nano
 {
 /** Returns the error code if non-zero, otherwise the value */
 template <class T>
-auto either (T && value, std::error_code ec) -> expected<std::remove_reference_t<T>, std::error_code>
+auto either (T && value, std::error_code ec) -> expected<typename std::remove_reference<T>::type, std::error_code>
 {
 	if (ec)
 	{