Browse Source

Build fixes.

cl-refactor
Gav Wood 10 years ago
parent
commit
3b17797b46
  1. 6
      libweb3jsonrpc/WebThreeStubServer.cpp
  2. 2
      libwhisper/Common.h

6
libweb3jsonrpc/WebThreeStubServer.cpp

@ -240,7 +240,7 @@ static shh::Envelope toSealed(Json::Value const& _json, shh::Message const& _m,
static pair<shh::TopicMask, Public> toWatch(Json::Value const& _json)
{
shh::BuildTopicMask bt(shh::BuildTopicMask::Empty);
shh::BuildTopicMask bt;
Public to;
if (!_json["to"].empty())
@ -252,12 +252,8 @@ static pair<shh::TopicMask, Public> toWatch(Json::Value const& _json)
bt.shift(jsToBytes(_json["topic"].asString()));
else if (_json["topic"].isArray())
for (auto i: _json["topic"])
{
if (i.isString())
bt.shift(jsToBytes(i.asString()));
else
bt.shift();
}
}
return make_pair(bt.toTopicMask(), to);
}

2
libwhisper/Common.h

@ -114,7 +114,7 @@ private:
class BuildTopicMask: BuildTopic
{
public:
template <class T> BuildTopicMask() {}
BuildTopicMask() {}
template <class T> BuildTopicMask(T const& _t) { shift(_t); }
template <class T> BuildTopicMask& shift(T const& _r) { BuildTopic::shift(_r); return *this; }

Loading…
Cancel
Save