Unverified Commit 2907b39e authored by Dennis Jenkins's avatar Dennis Jenkins Committed by GitHub

Merge branch 'master' into 249-building-and-running-tests

parents 652d1e0b 957198b8
...@@ -38,7 +38,7 @@ Now, compile the sources: ...@@ -38,7 +38,7 @@ Now, compile the sources:
If you want the examples built, then change change the cmake above to: If you want the examples built, then change change the cmake above to:
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCPISTACHE_BUILD_EXAMPLES=true .. cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DPISTACHE_BUILD_EXAMPLES=true ..
After running the above, you can then cd into the build/examples directory and run make. After running the above, you can then cd into the build/examples directory and run make.
......
...@@ -202,7 +202,7 @@ void serializeDescription(Writer& writer, const Description& desc) { ...@@ -202,7 +202,7 @@ void serializeDescription(Writer& writer, const Description& desc) {
writer.EndObject(); writer.EndObject();
} }
std::string rapidJson(const Description& desc) { inline std::string rapidJson(const Description& desc) {
rapidjson::StringBuffer sb; rapidjson::StringBuffer sb;
rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(sb); rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(sb);
serializeDescription(writer, desc); serializeDescription(writer, desc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment