* fix ToJsonString
This commit is contained in:
parent
b24b7cfadf
commit
5cde655253
@ -411,7 +411,7 @@ Json::String ToJsonString(const char* toConvert) {
|
|||||||
Json::String ToJsonString(const Json::String& in) { return in; }
|
Json::String ToJsonString(const Json::String& in) { return in; }
|
||||||
|
|
||||||
#if JSONCPP_USING_SECURE_MEMORY
|
#if JSONCPP_USING_SECURE_MEMORY
|
||||||
Json::String ToJsonString(std::string in) {
|
Json::String ToJsonString(const std::string& in) {
|
||||||
return Json::String(in.data(), in.data() + in.length());
|
return Json::String(in.data(), in.data() + in.length());
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -184,9 +184,9 @@ TestResult& checkEqual(TestResult& result, T expected, U actual,
|
|||||||
}
|
}
|
||||||
|
|
||||||
Json::String ToJsonString(const char* toConvert);
|
Json::String ToJsonString(const char* toConvert);
|
||||||
Json::String ToJsonString(Json::String in);
|
Json::String ToJsonString(const Json::String& in);
|
||||||
#if JSONCPP_USING_SECURE_MEMORY
|
#if JSONCPP_USING_SECURE_MEMORY
|
||||||
Json::String ToJsonString(std::string in);
|
Json::String ToJsonString(const std::string& in);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
TestResult& checkStringEqual(TestResult& result, const Json::String& expected,
|
TestResult& checkStringEqual(TestResult& result, const Json::String& expected,
|
||||||
|
Loading…
Reference in New Issue
Block a user