aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/JSON/ProtobufJSON.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-05-13 11:49:09 +0200
committerShauren <shauren.trinity@gmail.com>2017-05-13 11:49:09 +0200
commitbeb3316089b350a43e917d896e682298df8dcfc0 (patch)
tree8006c52594009f226d834991d101c97057699594 /src/server/shared/JSON/ProtobufJSON.cpp
parentc00316d3d4b57826cc8e38feed24faf84832c04b (diff)
Core/Shared: Include cleanup
Diffstat (limited to 'src/server/shared/JSON/ProtobufJSON.cpp')
-rw-r--r--src/server/shared/JSON/ProtobufJSON.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/shared/JSON/ProtobufJSON.cpp b/src/server/shared/JSON/ProtobufJSON.cpp
index 68e46f3fd57..dcf7dc0436f 100644
--- a/src/server/shared/JSON/ProtobufJSON.cpp
+++ b/src/server/shared/JSON/ProtobufJSON.cpp
@@ -16,10 +16,10 @@
*/
#include "ProtobufJSON.h"
-#include "StringFormat.h"
-#include "Common.h"
#include "Errors.h"
#include "Log.h"
+#include "StringFormat.h"
+#include <google/protobuf/message.h>
#include <rapidjson/writer.h>
#include <rapidjson/reader.h>
#include <rapidjson/stringbuffer.h>
@@ -186,7 +186,7 @@ void Serializer::WriteRepeatedMessageField(google::protobuf::Message const& valu
class Deserializer : public rapidjson::BaseReaderHandler<rapidjson::UTF8<>, Deserializer>
{
public:
- bool ReadMessage(std::string json, google::protobuf::Message* message);
+ bool ReadMessage(std::string const& json, google::protobuf::Message* message);
bool Key(const Ch* str, rapidjson::SizeType length, bool copy);
bool Null();
@@ -213,7 +213,7 @@ private:
std::vector<std::string> _errors;
};
-bool Deserializer::ReadMessage(std::string json, google::protobuf::Message* message)
+bool Deserializer::ReadMessage(std::string const& json, google::protobuf::Message* message)
{
rapidjson::StringStream ss(json.c_str());
@@ -443,10 +443,10 @@ std::string JSON::Serialize(google::protobuf::Message const& message)
return serializer.GetString();
}
-bool JSON::Deserialize(std::string json, google::protobuf::Message* message)
+bool JSON::Deserialize(std::string const& json, google::protobuf::Message* message)
{
Deserializer deserializer;
- if (!deserializer.ReadMessage(std::forward<std::string>(json), message))
+ if (!deserializer.ReadMessage(json, message))
{
for (std::size_t i = 0; i < deserializer.GetErrors().size(); ++i)
TC_LOG_ERROR("json", "%s", deserializer.GetErrors()[i].c_str());