You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2013/03/08 22:48:39 UTC
svn commit: r1454595 - in /qpid/trunk/qpid/cpp/src/qpid/broker: Selector.cpp
SelectorExpression.cpp SelectorToken.h SelectorValue.cpp
posix/SocketFDPlugin.cpp
Author: astitcher
Date: Fri Mar 8 21:48:39 2013
New Revision: 1454595
URL: http://svn.apache.org/r1454595
Log:
QPID-4633, QPID-4634: RHEL 5 related compilation problems
- Some things that the gcc 4.1/boost 1.33 environment in RHEL5
cares about.
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Selector.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/SelectorToken.h
qpid/trunk/qpid/cpp/src/qpid/broker/SelectorValue.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Selector.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Selector.cpp?rev=1454595&r1=1454594&r2=1454595&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Selector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Selector.cpp Fri Mar 8 21:48:39 2013
@@ -171,7 +171,8 @@ bool Selector::eval(const SelectorEnv& e
bool Selector::filter(const Message& msg)
{
- return eval(MessageSelectorEnv(msg));
+ const MessageSelectorEnv env(msg);
+ return eval(env);
}
namespace {
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SelectorExpression.cpp?rev=1454595&r1=1454594&r2=1454595&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SelectorExpression.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SelectorExpression.cpp Fri Mar 8 21:48:39 2013
@@ -103,6 +103,7 @@ public:
class ComparisonOperator {
public:
+ virtual ~ComparisonOperator() {}
virtual void repr(ostream&) const = 0;
virtual BoolOrNone eval(Expression&, Expression&, const SelectorEnv&) const = 0;
};
@@ -110,6 +111,7 @@ public:
template <typename T>
class UnaryBooleanOperator {
public:
+ virtual ~UnaryBooleanOperator() {}
virtual void repr(ostream&) const = 0;
virtual BoolOrNone eval(T&, const SelectorEnv&) const = 0;
};
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SelectorToken.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SelectorToken.h?rev=1454595&r1=1454594&r2=1454595&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SelectorToken.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SelectorToken.h Fri Mar 8 21:48:39 2013
@@ -22,7 +22,7 @@
*
*/
-#include "qpid/broker/BrokerImportExport.h"
+#include "qpid/broker/BrokerImportExport.h"
#include <iosfwd>
#include <string>
@@ -108,4 +108,4 @@ public:
}}
-#endif
\ No newline at end of file
+#endif
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SelectorValue.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SelectorValue.cpp?rev=1454595&r1=1454594&r2=1454595&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SelectorValue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SelectorValue.cpp Fri Mar 8 21:48:39 2013
@@ -43,6 +43,7 @@ ostream& operator<<(ostream& os, const V
class NumericPairBase {
public:
+ virtual ~NumericPairBase() {}
virtual Value add() = 0;
virtual Value sub() = 0;
virtual Value mul() = 0;
@@ -193,4 +194,4 @@ Value operator/(const Value& v1, const V
return Value();
}
-}}
\ No newline at end of file
+}}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp?rev=1454595&r1=1454594&r2=1454595&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp Fri Mar 8 21:48:39 2013
@@ -35,8 +35,6 @@
namespace qpid {
namespace sys {
-namespace {
-
struct SocketOptions : public Options {
std::vector<int> socketFds;
@@ -58,8 +56,6 @@ bool isSocket(int fd)
return S_ISSOCK(st_fd.st_mode);
}
-}
-
// Static instance to initialise plugin
static class SocketFDPlugin : public Plugin {
SocketOptions options;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org