From d7a7f9d9b05c3e3a9728bb1644a556527a721afd Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Fri, 28 Apr 2017 14:24:36 +0300 Subject: CMakeLists.txt updates Strip symbols, link the runtime statically, fix MinGW-w64 builds, etc. --- um/service/include/libservice/windows_error.hpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'um/service/include/libservice') diff --git a/um/service/include/libservice/windows_error.hpp b/um/service/include/libservice/windows_error.hpp index f7ac90e..13d7f47 100644 --- a/um/service/include/libservice/windows_error.hpp +++ b/um/service/include/libservice/windows_error.hpp @@ -8,6 +8,7 @@ #include "common.hpp" #include "singleton.hpp" +#include #include #include @@ -25,7 +26,29 @@ namespace libservice private: friend class Singleton; }; + + namespace error + { + inline std::string build_what( + const char* function, + const char* file, + int line) + { + std::ostringstream oss; + oss << "Error in function '" << function + << "' at file '" << file + << "', line " << line; + return oss.str(); + } + } } +#if defined(_MSC_VER) #define LIBSERVICE_ERROR_PREFIX \ "Error in function '" LIBSERVICE_FUNCTION_NAME "' at file '" LIBSERVICE_FILE_PATH "', line " LIBSERVICE_LINE_NUMBER_STRING +#elif defined(__GNUC__) +#define LIBSERVICE_ERROR_PREFIX \ + libservice::error::build_what(LIBSERVICE_FUNCTION_NAME, LIBSERVICE_FILE_PATH, LIBSERVICE_LINE_NUMBER) +#else +#define LIBSERVICE_ERROR_PREFIX "Error" +#endif -- cgit v1.2.3