# HG changeset patch # User Benjamin Golinvaux # Date 1560780794 -7200 # Node ID 101073b3e855076bf88d2d6aa171c25fefd03f6b # Parent df0c73ee7afa4f1d4982ace8032331efdc02f5aa Added namespace to ORTHANC_ASSERT macros diff -r df0c73ee7afa -r 101073b3e855 Framework/StoneException.h --- a/Framework/StoneException.h Mon Jun 17 16:12:52 2019 +0200 +++ b/Framework/StoneException.h Mon Jun 17 16:13:14 2019 +0200 @@ -128,11 +128,9 @@ std::stringstream sst; \ sst << "Assertion failed. Condition = \"" #cond "\""; \ std::string sstr = sst.str(); \ - throw OrthancException(ErrorCode_InternalError,sstr.c_str()); \ + throw ::Orthanc::OrthancException(::Orthanc::ErrorCode_InternalError,sstr.c_str()); \ } else (void)0 - - # define ORTHANC_EXPAND( x ) x # define GET_ORTHANC_ASSERT(_1,_2,NAME,...) NAME # define ORTHANC_ASSERT(...) ORTHANC_EXPAND(GET_ORTHANC_ASSERT(__VA_ARGS__, ORTHANC_ASSERT2, ORTHANC_ASSERT1, UNUSED)(__VA_ARGS__))