j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #205 from nlohmann/issue204

Browse source 
replaced ssize_t occurrences with auto (fixes #204)
This commit is contained in:
Niels 2016-02-10 21:41:55 +01:00
commit 61fe90f998
2 changed files with 6 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/json.hpp
View file

@ -34,25 +34,12 @@ Licensed under the MIT License <http://opensource.org/licenses/MIT>.
#include <utility> #include <utility>
#include <vector> #include <vector>
// enable ssize_t on MinGW
#ifdef __GNUC__
#ifdef __MINGW32__
#include <sys/types.h>
#endif
#endif
// disable float-equal warnings on GCC/clang // disable float-equal warnings on GCC/clang
#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) #if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wfloat-equal" #pragma GCC diagnostic ignored "-Wfloat-equal"
#endif #endif
// enable ssize_t for MSVC
#ifdef _MSC_VER
#include <basetsd.h>
using ssize_t = SSIZE_T;
#endif
/*! /*!
@brief namespace for Niels Lohmann @brief namespace for Niels Lohmann
@see https://github.com/nlohmann @see https://github.com/nlohmann
@ -7983,9 +7970,9 @@ basic_json_parser_63:
return; return;
} }
const ssize_t offset_start = m_start - m_content; const auto offset_start = m_start - m_content;
const ssize_t offset_marker = m_marker - m_start; const auto offset_marker = m_marker - m_start;
const ssize_t offset_cursor = m_cursor - m_start; const auto offset_cursor = m_cursor - m_start;
m_buffer.erase(0, static_cast<size_t>(offset_start)); m_buffer.erase(0, static_cast<size_t>(offset_start));
std::string line; std::string line;

19
src/json.hpp.re2c
View file

@ -34,25 +34,12 @@ Licensed under the MIT License <http://opensource.org/licenses/MIT>.
#include <utility> #include <utility>
#include <vector> #include <vector>
// enable ssize_t on MinGW
#ifdef __GNUC__
#ifdef __MINGW32__
#include <sys/types.h>
#endif
#endif
// disable float-equal warnings on GCC/clang // disable float-equal warnings on GCC/clang
#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) #if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wfloat-equal" #pragma GCC diagnostic ignored "-Wfloat-equal"
#endif #endif
// enable ssize_t for MSVC
#ifdef _MSC_VER
#include <basetsd.h>
using ssize_t = SSIZE_T;
#endif
/*! /*!
@brief namespace for Niels Lohmann @brief namespace for Niels Lohmann
@see https://github.com/nlohmann @see https://github.com/nlohmann
@ -7293,9 +7280,9 @@ class basic_json
return; return;
} }
const ssize_t offset_start = m_start - m_content; const auto offset_start = m_start - m_content;
const ssize_t offset_marker = m_marker - m_start; const auto offset_marker = m_marker - m_start;
const ssize_t offset_cursor = m_cursor - m_start; const auto offset_cursor = m_cursor - m_start;
m_buffer.erase(0, static_cast<size_t>(offset_start)); m_buffer.erase(0, static_cast<size_t>(offset_start));
std::string line; std::string line;