You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2009/02/02 22:39:27 UTC
svn commit: r740113 - in /qpid/trunk/qpid/cpp/src/qpid/console: Event.cpp
Event.h
Author: shuston
Date: Mon Feb 2 21:39:27 2009
New Revision: 740113
URL: http://svn.apache.org/viewvc?rev=740113&view=rev
Log:
Prepend SEV_ to sevrity enum names to avoid macro clash on Windows; fixes QPID-1561
Modified:
qpid/trunk/qpid/cpp/src/qpid/console/Event.cpp
qpid/trunk/qpid/cpp/src/qpid/console/Event.h
Modified: qpid/trunk/qpid/cpp/src/qpid/console/Event.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Event.cpp?rev=740113&r1=740112&r2=740113&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Event.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Event.cpp Mon Feb 2 21:39:27 2009
@@ -52,14 +52,14 @@
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>");
}
Modified: qpid/trunk/qpid/cpp/src/qpid/console/Event.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Event.h?rev=740113&r1=740112&r2=740113&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Event.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Event.h Mon Feb 2 21:39:27 2009
@@ -42,8 +42,8 @@
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);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org