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

Fixed mismatch of decl/def return types on ReadString

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

2
demboyz/base/jsonfile.cpp
View File

@ -362,7 +362,7 @@ namespace base
return val.GetUint64(); return val.GetUint64();
} }
std::uint32_t JsonReaderObject::ReadString(const char* name, char* dest, std::uint32_t maxLength) std::size_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())

2
demboyz/base/jsonfile.h
View File

@ -114,7 +114,7 @@ namespace base
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::size_t ReadString(const char* name, char* dest, std::size_t maxLength);
std::string ReadString(const char* name, std::size_t maxLength); //std::string ReadString(const char* name, std::size_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);