You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2009/05/01 18:00:43 UTC
svn commit: r770734 - /qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp
Author: aconway
Date: Fri May 1 16:00:43 2009
New Revision: 770734
URL: http://svn.apache.org/viewvc?rev=770734&view=rev
Log:
Remove workaround for buggy corosync headers, no longer needed.
Modified:
qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp?rev=770734&r1=770733&r2=770734&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp Fri May 1 16:00:43 2009
@@ -150,13 +150,9 @@
string Cpg::errorStr(cpg_error_t err, const std::string& msg) {
std::ostringstream os;
os << msg << ": ";
- // FIXME aconway 2009-03-11: The commented out cases below are
- // because of mistakes in the latest corosync header files.
- // The code should be re-instated when that is sorted out.
- //
switch (err) {
case CPG_OK: os << "ok"; break;
- // case CPG_ERR_LIBRARY: os << "library"; break;
+ case CPG_ERR_LIBRARY: os << "library"; break;
case CPG_ERR_TIMEOUT: os << "timeout"; break;
case CPG_ERR_TRY_AGAIN: os << "try again"; break;
case CPG_ERR_INVALID_PARAM: os << "invalid param"; break;
@@ -166,8 +162,8 @@
case CPG_ERR_NOT_EXIST: os << "not exist"; break;
case CPG_ERR_EXIST: os << "exist"; break;
case CPG_ERR_NOT_SUPPORTED: os << "not supported"; break;
- // case CPG_ERR_SECURITY: os << "security"; break;
- // case CPG_ERR_TOO_MANY_GROUPS: os << "too many groups"; break;
+ case CPG_ERR_SECURITY: os << "security"; break;
+ case CPG_ERR_TOO_MANY_GROUPS: os << "too many groups"; break;
default: os << ": unknown cpg error " << err;
};
os << " (" << err << ")";
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org