summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2011-05-09 19:55:49 +0000
committerAndrew Stitcher <astitcher@apache.org>2011-05-09 19:55:49 +0000
commit0a27dd86ee5a454a20520d10c987de793be0a4e3 (patch)
tree14e7ce5878604a21fe80eb26d473ff5f942c857b
parent8f037754063fcc694341fd4e9a72564b082fea47 (diff)
downloadqpid-python-0a27dd86ee5a454a20520d10c987de793be0a4e3.tar.gz
QPID-3004: Get Clang to compile qpid c++
- Explicitly specify parent method as clang didn't find it [is this a clang++ 2.9 bug?] git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1101180 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/sys/StateMonitor.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/sys/StateMonitor.h b/qpid/cpp/src/qpid/sys/StateMonitor.h
index b74195fb8d..eac37a8543 100644
--- a/qpid/cpp/src/qpid/sys/StateMonitor.h
+++ b/qpid/cpp/src/qpid/sys/StateMonitor.h
@@ -41,9 +41,9 @@ class StateMonitor : public Waitable
struct Set : public std::bitset<MaxEnum + 1> {
Set() {}
Set(Enum s) { set(s); }
- Set(Enum s, Enum t) { set(s).set(t); }
- Set(Enum s, Enum t, Enum u) { set(s).set(t).set(u); }
- Set(Enum s, Enum t, Enum u, Enum v) { set(s).set(t).set(u).set(v); }
+ Set(Enum s, Enum t) { std::bitset<MaxEnum + 1>::set(s).set(t); }
+ Set(Enum s, Enum t, Enum u) { std::bitset<MaxEnum + 1>::set(s).set(t).set(u); }
+ Set(Enum s, Enum t, Enum u, Enum v) { std::bitset<MaxEnum + 1>::set(s).set(t).set(u).set(v); }
};