From 806f42dd84aae1eb2dfe46572eb5bf367b488603 Mon Sep 17 00:00:00 2001 From: Jordan Cristiano Date: Mon, 31 Aug 2015 22:51:15 -0400 Subject: [PATCH] Fixed mismatch of decl/def return types on ReadString --- demboyz/base/jsonfile.cpp | 2 +- demboyz/base/jsonfile.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demboyz/base/jsonfile.cpp b/demboyz/base/jsonfile.cpp index aecaa41..672f418 100644 --- a/demboyz/base/jsonfile.cpp +++ b/demboyz/base/jsonfile.cpp @@ -362,7 +362,7 @@ namespace base 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]; if (!val.IsString()) diff --git a/demboyz/base/jsonfile.h b/demboyz/base/jsonfile.h index 2f94afc..8520c99 100644 --- a/demboyz/base/jsonfile.h +++ b/demboyz/base/jsonfile.h @@ -114,7 +114,7 @@ namespace base 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::string ReadString(const char* name, std::size_t maxLength); float ReadFloat(const char* name); std::size_t ReadBits(const char* name, unsigned char* dest, std::size_t numBits);