From dad7fcb5a3a5535744f9a52e9cce9a482ad9669e Mon Sep 17 00:00:00 2001 From: Jacob Dufault Date: Thu, 2 Mar 2017 10:25:40 -0800 Subject: [PATCH] small clang build fixes --- serializer.cc | 26 +++++++++++++------------- serializer.h | 16 ++++++++-------- task.cc | 8 ++++---- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/serializer.cc b/serializer.cc index 092ae902..8dadc72e 100644 --- a/serializer.cc +++ b/serializer.cc @@ -59,7 +59,7 @@ void Serialize(Writer& writer, IndexedFile* file) { assert(file->Resolve(it->second)->uses.size() == 0); } -#define SERIALIZE(json_name, member_name) Serialize(writer, json_name, def.##member_name) +#define SERIALIZE(json_name, member_name) Serialize(writer, json_name, def.member_name) writer.StartObject(); @@ -137,13 +137,13 @@ void Serialize(Writer& writer, IndexedFile* file) { #undef WRITE } -void Deserialize(rapidjson::GenericValue>& document, const char* name, std::string& output) { +void Deserialize(const rapidjson::GenericValue>& document, const char* name, std::string& output) { auto it = document.FindMember(name); if (it != document.MemberEnd()) output = it->value.GetString(); } -void Deserialize(rapidjson::GenericValue>& document, const char* name, std::vector& output) { +void Deserialize(const rapidjson::GenericValue>& document, const char* name, std::vector& output) { auto it = document.FindMember(name); if (it != document.MemberEnd()) { for (auto& entry : it->value.GetArray()) @@ -151,13 +151,13 @@ void Deserialize(rapidjson::GenericValue>& document, const cha } } -void Deserialize(rapidjson::GenericValue>& document, const char* name, optional& output) { +void Deserialize(const rapidjson::GenericValue>& document, const char* name, optional& output) { auto it = document.FindMember(name); if (it != document.MemberEnd()) output = Location(it->value.GetString()); // TODO: Location parsing not implemented in Location type. } -void Deserialize(rapidjson::GenericValue>& document, const char* name, std::vector& output) { +void Deserialize(const rapidjson::GenericValue>& document, const char* name, std::vector& output) { auto it = document.FindMember(name); if (it != document.MemberEnd()) { for (auto& array_value : it->value.GetArray()) @@ -165,11 +165,11 @@ void Deserialize(rapidjson::GenericValue>& document, const cha } } -void Deserialize(Reader& reader, IndexedFile* file) { -#define DESERIALIZE(json_name, member_name) Deserialize(entry, json_name, def.##member_name) +void Deserialize(const Reader& reader, IndexedFile* file) { +#define DESERIALIZE(json_name, member_name) Deserialize(entry, json_name, def.member_name) - auto& types = reader["types"].GetArray(); - for (auto& entry : types) { + const auto& types = reader["types"].GetArray(); + for (const auto& entry : types) { TypeId id(entry["id"].GetInt64()); std::string usr = entry["usr"].GetString(); @@ -188,8 +188,8 @@ void Deserialize(Reader& reader, IndexedFile* file) { file->types.push_back(def); } - auto& functions = reader["functions"].GetArray(); - for (auto& entry : functions) { + const auto& functions = reader["functions"].GetArray(); + for (const auto& entry : functions) { FuncId id(entry["id"].GetInt64()); std::string usr = entry["usr"].GetString(); @@ -209,8 +209,8 @@ void Deserialize(Reader& reader, IndexedFile* file) { file->funcs.push_back(def); } - auto& vars = reader["variables"].GetArray(); - for (auto& entry : vars) { + const auto& vars = reader["variables"].GetArray(); + for (const auto& entry : vars) { VarId id(entry["id"].GetInt64()); std::string usr = entry["usr"].GetString(); diff --git a/serializer.h b/serializer.h index 39f361bb..be05900f 100644 --- a/serializer.h +++ b/serializer.h @@ -63,14 +63,14 @@ void Serialize(Writer& writer, IndexedFile* file); template -void Deserialize(rapidjson::GenericValue>& document, const char* name, optional>& output) { +void Deserialize(const rapidjson::GenericValue>& document, const char* name, optional>& output) { auto it = document.FindMember(name); if (it != document.MemberEnd()) output = Id(it->value.GetUint64()); } template -void Deserialize(rapidjson::GenericValue>& document, const char* name, std::vector>& output) { +void Deserialize(const rapidjson::GenericValue>& document, const char* name, std::vector>& output) { auto it = document.FindMember(name); if (it != document.MemberEnd()) { for (auto& array_value : it->value.GetArray()) @@ -79,7 +79,7 @@ void Deserialize(rapidjson::GenericValue>& document, const cha } template -void Deserialize(rapidjson::GenericValue>& document, const char* name, std::vector>& output) { +void Deserialize(const rapidjson::GenericValue>& document, const char* name, std::vector>& output) { auto it = document.FindMember(name); if (it != document.MemberEnd()) { for (auto& array_value : it->value.GetArray()) { @@ -90,11 +90,11 @@ void Deserialize(rapidjson::GenericValue>& document, const cha } } } -void Deserialize(rapidjson::GenericValue>& document, const char* name, std::string& output); -void Deserialize(rapidjson::GenericValue>& document, const char* name, std::vector& output); -void Deserialize(rapidjson::GenericValue>& document, const char* name, optional& output); -void Deserialize(rapidjson::GenericValue>& document, const char* name, std::vector& output); -void Deserialize(Reader& reader, IndexedFile* file); +void Deserialize(const rapidjson::GenericValue>& document, const char* name, std::string& output); +void Deserialize(const rapidjson::GenericValue>& document, const char* name, std::vector& output); +void Deserialize(const rapidjson::GenericValue>& document, const char* name, optional& output); +void Deserialize(const rapidjson::GenericValue>& document, const char* name, std::vector& output); +void Deserialize(const Reader& reader, IndexedFile* file); std::string Serialize(IndexedFile* file); IndexedFile Deserialize(std::string path, std::string serialized); diff --git a/task.cc b/task.cc index 9c6f3e12..4c962fad 100644 --- a/task.cc +++ b/task.cc @@ -1,4 +1,4 @@ -#include > +#include #include #include #include @@ -9,7 +9,7 @@ #include "query.h" #include "optional.h" #include "utils.h" -#include "third_party/tiny-process-library/process.hpp" +//#include "third_party/tiny-process-library/process.hpp" #include #include @@ -64,7 +64,7 @@ private: struct Task { int priority = 0; bool writes_to_index = false; - + enum class Kind { CreateIndex, IndexImport, @@ -221,4 +221,4 @@ int main252525225(int argc, char** argv) { std::cin.get(); return 0; -} \ No newline at end of file +}