From 21aaa7c0fc25c5a6dc9521112b8cc89ae25049c6 Mon Sep 17 00:00:00 2001
From: Andrew Stitcher <astitcher@apache.org>
Date: Fri, 8 Mar 2013 21:48:39 +0000
Subject: QPID-4633, QPID-4634: RHEL 5 related compilation problems - Some
 things that the gcc 4.1/boost 1.33 environment in RHEL5   cares about.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454595 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/qpid/broker/Selector.cpp             | 3 ++-
 qpid/cpp/src/qpid/broker/SelectorExpression.cpp   | 2 ++
 qpid/cpp/src/qpid/broker/SelectorToken.h          | 4 ++--
 qpid/cpp/src/qpid/broker/SelectorValue.cpp        | 3 ++-
 qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp | 4 ----
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'qpid/cpp/src')

diff --git a/qpid/cpp/src/qpid/broker/Selector.cpp b/qpid/cpp/src/qpid/broker/Selector.cpp
index d3d4ced4df..a6378f1910 100644
--- a/qpid/cpp/src/qpid/broker/Selector.cpp
+++ b/qpid/cpp/src/qpid/broker/Selector.cpp
@@ -171,7 +171,8 @@ bool Selector::eval(const SelectorEnv& env)
 
 bool Selector::filter(const Message& msg)
 {
-    return eval(MessageSelectorEnv(msg));
+    const MessageSelectorEnv env(msg);
+    return eval(env);
 }
 
 namespace {
diff --git a/qpid/cpp/src/qpid/broker/SelectorExpression.cpp b/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
index 36d3a7d8ec..8fcafeb2a1 100644
--- a/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
+++ b/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
@@ -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;
 };
diff --git a/qpid/cpp/src/qpid/broker/SelectorToken.h b/qpid/cpp/src/qpid/broker/SelectorToken.h
index 5b0cf51985..62f6d78fdd 100644
--- a/qpid/cpp/src/qpid/broker/SelectorToken.h
+++ b/qpid/cpp/src/qpid/broker/SelectorToken.h
@@ -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
diff --git a/qpid/cpp/src/qpid/broker/SelectorValue.cpp b/qpid/cpp/src/qpid/broker/SelectorValue.cpp
index d35e4edd3e..83a9240dcb 100644
--- a/qpid/cpp/src/qpid/broker/SelectorValue.cpp
+++ b/qpid/cpp/src/qpid/broker/SelectorValue.cpp
@@ -43,6 +43,7 @@ ostream& operator<<(ostream& os, const Value& 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 Value& v2)
     return Value();
 }
 
-}}
\ No newline at end of file
+}}
diff --git a/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp b/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
index f48198932d..f141e6ad1a 100644
--- a/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
+++ b/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
@@ -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;
-- 
cgit v1.2.1