# HG changeset patch # User Sebastien Jodogne # Date 1481904093 -3600 # Node ID 15637de71feeeda31b598851f61cf72f9f889f1f # Parent 4f0a9a61d905bab8de98231c54e24619ae51f5f7 fix diff -r 4f0a9a61d905 -r 15637de71fee Plugins/Samples/Common/OrthancPluginCppWrapper.h --- a/Plugins/Samples/Common/OrthancPluginCppWrapper.h Fri Dec 16 16:22:38 2016 +0100 +++ b/Plugins/Samples/Common/OrthancPluginCppWrapper.h Fri Dec 16 17:01:33 2016 +0100 @@ -447,7 +447,7 @@ Callback(output, url, request); return OrthancPluginErrorCode_Success; } - catch (ORTHANC_PLUGINS_GET_EXCEPTION_CLASS& e) + catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) { return static_cast(e.GetErrorCode()); } diff -r 4f0a9a61d905 -r 15637de71fee Plugins/Samples/Common/OrthancPluginException.h --- a/Plugins/Samples/Common/OrthancPluginException.h Fri Dec 16 16:22:38 2016 +0100 +++ b/Plugins/Samples/Common/OrthancPluginException.h Fri Dec 16 17:01:33 2016 +0100 @@ -39,23 +39,23 @@ #if HAS_ORTHANC_EXCEPTION == 1 # include "../../../Core/OrthancException.h" -# define ORTHANC_PLUGINS_GET_ERROR_ENUMERATION ::Orthanc::ErrorCode -# define ORTHANC_PLUGINS_GET_ERROR_CODE(code) ::Orthanc::ErrorCode_ ## code -# define ORTHANC_PLUGINS_GET_EXCEPTION_CLASS ::Orthanc::OrthancException +# define ORTHANC_PLUGINS_ERROR_ENUMERATION ::Orthanc::ErrorCode +# define ORTHANC_PLUGINS_EXCEPTION_CLASS ::Orthanc::OrthancException +# define ORTHANC_PLUGINS_GET_ERROR_CODE(code) ::Orthanc::ErrorCode_ ## code #else # include -# define ORTHANC_PLUGINS_GET_ERROR_ENUMERATION ::OrthancPluginErrorCode -# define ORTHANC_PLUGINS_GET_ERROR_CODE(code) ::OrthancPluginErrorCode_ ## code -# define ORTHANC_PLUGINS_GET_EXCEPTION_CLASS ::OrthancPlugins::PluginException +# define ORTHANC_PLUGINS_ERROR_ENUMERATION ::OrthancPluginErrorCode +# define ORTHANC_PLUGINS_EXCEPTION_CLASS ::OrthancPlugins::PluginException +# define ORTHANC_PLUGINS_GET_ERROR_CODE(code) ::OrthancPluginErrorCode_ ## code #endif #define ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code) \ - throw ORTHANC_PLUGINS_GET_EXCEPTION_CLASS(static_cast(code)); + throw ORTHANC_PLUGINS_EXCEPTION_CLASS(static_cast(code)); #define ORTHANC_PLUGINS_THROW_EXCEPTION(code) \ - throw ORTHANC_PLUGINS_GET_EXCEPTION_CLASS(ORTHANC_PLUGINS_GET_ERROR_CODE(code)); + throw ORTHANC_PLUGINS_EXCEPTION_CLASS(ORTHANC_PLUGINS_GET_ERROR_CODE(code)); #define ORTHANC_PLUGINS_CHECK_ERROR(code) \