You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2017/10/27 14:16:56 UTC
[3/6] qpid-cpp git commit: QPID-7893: Dubious fixes for
initialization warnings
QPID-7893: Dubious fixes for initialization warnings
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/c5363a48
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/c5363a48
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/c5363a48
Branch: refs/heads/master
Commit: c5363a48acc43949e74ae8d85a20858d2313de11
Parents: fc37733
Author: Justin Ross <jr...@apache.org>
Authored: Wed Sep 20 16:11:58 2017 -0700
Committer: Justin Ross <jr...@apache.org>
Committed: Fri Oct 27 07:00:39 2017 -0700
----------------------------------------------------------------------
src/qpid/broker/Selector.cpp | 4 +---
src/qpid/broker/SelectorExpression.cpp | 2 +-
src/qpid/broker/SelectorToken.h | 3 ++-
3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/c5363a48/src/qpid/broker/Selector.cpp
----------------------------------------------------------------------
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 @@ MessageSelectorEnv::MessageSelectorEnv(const Message& m) :
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 @@ const Value MessageSelectorEnv::specialValue(const string& id) const
returnedStrings.push_back(new string(jmsType));
v = returnedStrings[returnedStrings.size()-1];
}
- } else {
- v = Value();
}
return v;
}
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/c5363a48/src/qpid/broker/SelectorExpression.cpp
----------------------------------------------------------------------
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* unaryArithExpression(Tokeniser& tokeniser)
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;
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/c5363a48/src/qpid/broker/SelectorToken.h
----------------------------------------------------------------------
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 @@ struct Token {
std::string val;
std::string::const_iterator tokenStart;
- Token()
+ Token() :
+ type()
{}
Token(TokenType t, const std::string& v) :
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org