From e825cb3b34da31cac8a039db4067a859d2944b24 Mon Sep 17 00:00:00 2001 From: Roker Date: Thu, 18 Oct 2018 18:04:41 +0200 Subject: [PATCH 1/2] general template first, specialization second. --- Adapter.hh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Adapter.hh b/Adapter.hh index 31f25ed..6de2a46 100644 --- a/Adapter.hh +++ b/Adapter.hh @@ -8,7 +8,6 @@ #include #include #include -#include "Adapter.hxx" using namespace std; @@ -37,3 +36,5 @@ namespace pEp { void shutdown(); } } + +#include "Adapter.hxx" From addc7a16058efffbd9b21f3fac41d5fdeb53a59a Mon Sep 17 00:00:00 2001 From: Roker Date: Thu, 18 Oct 2018 18:05:49 +0200 Subject: [PATCH 2/2] correct initialization order: baseclass first, own members second --- Adapter.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adapter.cc b/Adapter.cc index 88d1e4b..d6741df 100644 --- a/Adapter.cc +++ b/Adapter.cc @@ -26,7 +26,7 @@ namespace pEp { } RuntimeError::RuntimeError(string _text, PEP_STATUS _status) - : text(_text), runtime_error(text.c_str()), status(_status) + : runtime_error(_text.c_str()), text(_text), status(_status) { }