diff options
| author | Alan Conway <aconway@apache.org> | 2009-05-01 16:00:43 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-05-01 16:00:43 +0000 |
| commit | 4ed7e726a3ee1f3a86acbd1e2c89598b60b8c70a (patch) | |
| tree | e3cb933cbc3616e29610fec70001133180e0555e /cpp/src/qpid/cluster/Cpg.cpp | |
| parent | dd8381e8751086f6dc3a07981f4bb1a1d34015bb (diff) | |
| download | qpid-python-4ed7e726a3ee1f3a86acbd1e2c89598b60b8c70a.tar.gz | |
Remove workaround for buggy corosync headers, no longer needed.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@770734 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/Cpg.cpp')
| -rw-r--r-- | cpp/src/qpid/cluster/Cpg.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/cpp/src/qpid/cluster/Cpg.cpp b/cpp/src/qpid/cluster/Cpg.cpp index f746eacea4..5ffb88abb6 100644 --- a/cpp/src/qpid/cluster/Cpg.cpp +++ b/cpp/src/qpid/cluster/Cpg.cpp @@ -150,13 +150,9 @@ void Cpg::dispatchBlocking() { 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 @@ string Cpg::errorStr(cpg_error_t err, const std::string& msg) { 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 << ")"; |