diff options
| author | Stefan Radomski <github@mintwerk.de> | 2016-12-09 12:54:46 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2016-12-09 12:54:46 (GMT) |
| commit | 1e56658c2415d154428fe419d8f0134c59856b6e (patch) | |
| tree | 2122ec471af63ec0549fb28973a68f9dfaf10f8a /src/uscxml/messages | |
| parent | 9b8e09c3fde755ec26e5c21b9640f53ed9329d05 (diff) | |
| download | uscxml-1e56658c2415d154428fe419d8f0134c59856b6e.zip uscxml-1e56658c2415d154428fe419d8f0134c59856b6e.tar.gz uscxml-1e56658c2415d154428fe419d8f0134c59856b6e.tar.bz2 | |
Oh how I despise MSVC
Diffstat (limited to 'src/uscxml/messages')
| -rw-r--r-- | src/uscxml/messages/Data.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/uscxml/messages/Data.cpp b/src/uscxml/messages/Data.cpp index a75e774..5d7dbf2 100644 --- a/src/uscxml/messages/Data.cpp +++ b/src/uscxml/messages/Data.cpp @@ -97,11 +97,11 @@ Data Data::fromJSON(const std::string& jsonString) { int nrTokens = trimmed.size() / frac; if (t != NULL) { free(t); -// LOG(INFO) << "Increasing JSON length to token ratio to 1/" << frac; +// LOG(USCXML_INFO) << "Increasing JSON length to token ratio to 1/" << frac; } t = (jsmntok_t*)malloc((nrTokens + 1) * sizeof(jsmntok_t)); if (t == NULL) { - LOG(ERROR) << "Cannot parse JSON, ran out of memory!"; + LOG(USCXML_ERROR) << "Cannot parse JSON, ran out of memory!"; return data; } memset(t, 0, (nrTokens + 1) * sizeof(jsmntok_t)); @@ -112,13 +112,13 @@ Data Data::fromJSON(const std::string& jsonString) { if (rv != 0) { switch (rv) { case JSMN_ERROR_NOMEM: - LOG(ERROR) << "Cannot parse JSON, not enough tokens were provided!"; + LOG(USCXML_ERROR) << "Cannot parse JSON, not enough tokens were provided!"; break; case JSMN_ERROR_INVAL: - LOG(ERROR) << "Cannot parse JSON, invalid character inside JSON string!"; + LOG(USCXML_ERROR) << "Cannot parse JSON, invalid character inside JSON string!"; break; case JSMN_ERROR_PART: - LOG(ERROR) << "Cannot parse JSON, the string is not a full JSON packet, more bytes expected!"; + LOG(USCXML_ERROR) << "Cannot parse JSON, the string is not a full JSON packet, more bytes expected!"; break; default: break; |