From 372267d19284fd9ed93fc5505245319e43c102a5 Mon Sep 17 00:00:00 2001 From: Jordan Cristiano Date: Mon, 31 Aug 2015 23:07:51 -0400 Subject: [PATCH] Rapidjson can only write up to 2^32 - 1 length strings by default, so change the api to reflect that --- demboyz/base/jsonfile.cpp | 4 ++-- demboyz/base/jsonfile.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demboyz/base/jsonfile.cpp b/demboyz/base/jsonfile.cpp index 672f418..b355754 100644 --- a/demboyz/base/jsonfile.cpp +++ b/demboyz/base/jsonfile.cpp @@ -159,7 +159,7 @@ namespace base 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; writer.String(name); @@ -362,7 +362,7 @@ namespace base 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]; if (!val.IsString()) diff --git a/demboyz/base/jsonfile.h b/demboyz/base/jsonfile.h index 8520c99..eca93d4 100644 --- a/demboyz/base/jsonfile.h +++ b/demboyz/base/jsonfile.h @@ -39,7 +39,7 @@ namespace base void WriteUInt32(const char* name, std::uint32_t value, bool writeCondition); 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, 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 WriteFloat(const char* name, const double value); @@ -113,8 +113,8 @@ namespace base std::int64_t ReadInt64(const char* name); std::uint32_t ReadUInt32(const char* name); std::uint64_t ReadUint64(const char* name); - std::size_t ReadString(const char* name, char* dest, std::size_t maxLength); - //std::string ReadString(const char* name, std::size_t maxLength); + std::uint32_t ReadString(const char* name, char* dest, std::uint32_t maxLength); + //std::string ReadString(const char* name, std::uint32_t maxLength); float ReadFloat(const char* name); std::size_t ReadBits(const char* name, unsigned char* dest, std::size_t numBits);