QPID-7893: Dubious fixes for initialization warnings
diff --git a/src/qpid/broker/Selector.cpp b/src/qpid/broker/Selector.cpp
index bf30df5..8309aa7 100644
--- a/src/qpid/broker/Selector.cpp
+++ b/src/qpid/broker/Selector.cpp
@@ -108,7 +108,7 @@
const Value MessageSelectorEnv::specialValue(const string& id) const
{
- Value v;
+ Value v = Value();
// TODO: Just use a simple if chain for now - improve this later
if ( id=="delivery_mode" ) {
v = msg.getEncoding().isPersistent() ? PERSISTENT : NON_PERSISTENT;
@@ -165,8 +165,6 @@
returnedStrings.push_back(new string(jmsType));
v = returnedStrings[returnedStrings.size()-1];
}
- } else {
- v = Value();
}
return v;
}
diff --git a/src/qpid/broker/SelectorExpression.cpp b/src/qpid/broker/SelectorExpression.cpp
index 1f21614..1b0afcb 100644
--- a/src/qpid/broker/SelectorExpression.cpp
+++ b/src/qpid/broker/SelectorExpression.cpp
@@ -1036,7 +1036,7 @@
Expression* parseExactNumeric(const Token& token, bool negate)
{
int base = 0;
- string s;
+ string s("");
std::remove_copy(token.val.begin(), token.val.end(), std::back_inserter(s), '_');
if (s[1]=='b' || s[1]=='B') {
base = 2;
diff --git a/src/qpid/broker/SelectorToken.h b/src/qpid/broker/SelectorToken.h
index bd60b69..e9f7ce0 100644
--- a/src/qpid/broker/SelectorToken.h
+++ b/src/qpid/broker/SelectorToken.h
@@ -69,7 +69,8 @@
std::string val;
std::string::const_iterator tokenStart;
- Token()
+ Token() :
+ type()
{}
Token(TokenType t, const std::string& v) :
