diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-02-02 21:39:27 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-02-02 21:39:27 +0000 |
| commit | 2c74dfaa87932a15fdf2c10fea964a1f5e5bc19a (patch) | |
| tree | b6ac513179d6c410e5e29e36825f19210f743eb4 /qpid/cpp/src | |
| parent | 75e72b1140efa2dcb0d67896a9449bad026a8fb6 (diff) | |
| download | qpid-python-2c74dfaa87932a15fdf2c10fea964a1f5e5bc19a.tar.gz | |
Prepend SEV_ to sevrity enum names to avoid macro clash on Windows; fixes QPID-1561
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@740113 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/console/Event.cpp | 16 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/console/Event.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/qpid/cpp/src/qpid/console/Event.cpp b/qpid/cpp/src/qpid/console/Event.cpp index b7fdde1487..7d6f5764a2 100644 --- a/qpid/cpp/src/qpid/console/Event.cpp +++ b/qpid/cpp/src/qpid/console/Event.cpp @@ -52,14 +52,14 @@ const ClassKey& Event::getClassKey() const string Event::getSeverityString() const { switch (severity) { - case EMERGENCY : return string("EMER"); - case ALERT : return string("ALERT"); - case CRITICAL : return string("CRIT"); - case ERROR : return string("ERROR"); - case WARNING : return string("WARN"); - case NOTICE : return string("NOTIC"); - case INFO : return string("INFO"); - case DEBUG : return string("DEBUG"); + case SEV_EMERGENCY : return string("EMER"); + case SEV_ALERT : return string("ALERT"); + case SEV_CRITICAL : return string("CRIT"); + case SEV_ERROR : return string("ERROR"); + case SEV_WARNING : return string("WARN"); + case SEV_NOTICE : return string("NOTIC"); + case SEV_INFO : return string("INFO"); + case SEV_DEBUG : return string("DEBUG"); } return string("<UNKNOWN>"); } diff --git a/qpid/cpp/src/qpid/console/Event.h b/qpid/cpp/src/qpid/console/Event.h index 4c8d639a33..14f5a64716 100644 --- a/qpid/cpp/src/qpid/console/Event.h +++ b/qpid/cpp/src/qpid/console/Event.h @@ -42,8 +42,8 @@ namespace console { class Event { public: typedef enum { - EMERGENCY = 0, ALERT = 1, CRITICAL = 2, ERROR = 3, WARNING = 4, - NOTICE = 5, INFO = 6, DEBUG = 7 + SEV_EMERGENCY = 0, SEV_ALERT = 1, SEV_CRITICAL = 2, SEV_ERROR = 3, + SEV_WARNING = 4, SEV_NOTICE = 5, SEV_INFO = 6, SEV_DEBUG = 7 } Severity; Event(Broker* broker, SchemaClass* schemaClass, framing::Buffer& buffer); |