From 6b9639afc80b51f63dc249d5059766fae9c84495 Mon Sep 17 00:00:00 2001 From: ado Date: Thu, 10 Dec 2020 20:41:49 +0100 Subject: [PATCH] update converter.hpp to work with gcc, add uninstall to makefile --- include/ss/converter.hpp | 18 +++++++++--------- makefile | 5 ++++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/include/ss/converter.hpp b/include/ss/converter.hpp index c20a458..503ecdd 100644 --- a/include/ss/converter.hpp +++ b/include/ss/converter.hpp @@ -307,15 +307,6 @@ class converter { } } - template <> - void extract_one(std::string& dst, const string_range msg, - size_t) { - SS_RETURN_ON_INVALID; - extract(msg.first, msg.second, dst); - } - -#undef SS_RETURN_ON_INVALID - template void extract_multiple(no_void_validator_tup_t& tup, const split_input& elems) { @@ -358,4 +349,13 @@ class converter { std::string error_; }; +template <> +void converter::extract_one(std::string& dst, + const string_range msg, size_t) { + SS_RETURN_ON_INVALID; + extract(msg.first, msg.second, dst); +} + +#undef SS_RETURN_ON_INVALID + } /* ss */ diff --git a/makefile b/makefile index a0ef5db..fc7ec42 100644 --- a/makefile +++ b/makefile @@ -1,5 +1,8 @@ install: - cp -r ./include/ss/ /usr/include/ + cp -r ./include/ss/ /usr/local/include/ + +uninstall: + rm -rf /usr/local/include/ss/*.hpp test: cd test && $(MAKE) -j4 && $(MAKE) test && $(MAKE) clean