CSSZombieEscape/demboyz
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rapidjson can only write up to 2^32 - 1 length strings by default, so change the api to reflect that

Browse Source
This commit is contained in:
Jordan Cristiano 2015-08-31 23:07:51 -04:00
parent 806f42dd84
commit 372267d192
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demboyz/base/jsonfile.cpp
View File

@ -159,7 +159,7 @@ namespace base
writer.String(value); writer.String(value);
} }
void JsonWriterFile::WriteString(const char* name, const char* value, std::size_t length) void JsonWriterFile::WriteString(const char* name, const char* value, std::uint32_t length)
{ {
auto& writer = m_writer; auto& writer = m_writer;
writer.String(name); writer.String(name);
@ -362,7 +362,7 @@ namespace base
return val.GetUint64(); return val.GetUint64();
} }
std::size_t JsonReaderObject::ReadString(const char* name, char* dest, std::uint32_t maxLength) std::uint32_t JsonReaderObject::ReadString(const char* name, char* dest, std::uint32_t maxLength)
{ {
const auto& val = m_value[name]; const auto& val = m_value[name];
if (!val.IsString()) if (!val.IsString())

6
demboyz/base/jsonfile.h
View File

@ -39,7 +39,7 @@ namespace base
void WriteUInt32(const char* name, std::uint32_t value, bool writeCondition); void WriteUInt32(const char* name, std::uint32_t value, bool writeCondition);
void WriteUint64(const char* name, std::uint64_t value); void WriteUint64(const char* name, std::uint64_t value);
void WriteString(const char* name, const char* value); void WriteString(const char* name, const char* value);
void WriteString(const char* name, const char* value, std::size_t length); void WriteString(const char* name, const char* value, std::uint32_t length);
void WriteString(const char* name, const std::string& value); void WriteString(const char* name, const std::string& value);
void WriteFloat(const char* name, const double value); void WriteFloat(const char* name, const double value);
@ -113,8 +113,8 @@ namespace base
std::int64_t ReadInt64(const char* name); std::int64_t ReadInt64(const char* name);
std::uint32_t ReadUInt32(const char* name); std::uint32_t ReadUInt32(const char* name);
std::uint64_t ReadUint64(const char* name); std::uint64_t ReadUint64(const char* name);
std::size_t ReadString(const char* name, char* dest, std::size_t maxLength); std::uint32_t ReadString(const char* name, char* dest, std::uint32_t maxLength);
//std::string ReadString(const char* name, std::size_t maxLength); //std::string ReadString(const char* name, std::uint32_t maxLength);
float ReadFloat(const char* name); float ReadFloat(const char* name);
std::size_t ReadBits(const char* name, unsigned char* dest, std::size_t numBits); std::size_t ReadBits(const char* name, unsigned char* dest, std::size_t numBits);