Skip to content

J
json
Commit 61fe90f9 authored by Niels's avatar Niels
Browse files
Options

Merge pull request #205 from nlohmann/issue204 

replaced ssize_t occurrences with auto (fixes #204)
parents 1cc47175 a831c787
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 32 deletions
src/json.hpp
View file @ 61fe90f9
......@@ -34,25 +34,12 @@ Licensed under the MIT License <http://opensource.org/licenses/MIT>.
#include <utility>
#include <vector>
// enable ssize_t on MinGW
#ifdef __GNUC__
#ifdef __MINGW32__
#include <sys/types.h>
#endif
#endif
// disable float-equal warnings on GCC/clang
#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wfloat-equal"
#endif
// enable ssize_t for MSVC
#ifdef _MSC_VER
#include <basetsd.h>
using ssize_t = SSIZE_T;
#endif
/*!
@brief namespace for Niels Lohmann
@see https://github.com/nlohmann
......@@ -7983,9 +7970,9 @@ basic_json_parser_63:
return;
}
const ssize_t offset_start = m_start - m_content;
const ssize_t offset_marker = m_marker - m_start;
const ssize_t offset_cursor = m_cursor - m_start;
const auto offset_start = m_start - m_content;
const auto offset_marker = m_marker - m_start;
const auto offset_cursor = m_cursor - m_start;
m_buffer.erase(0, static_cast<size_t>(offset_start));
std::string line;
......
src/json.hpp.re2c
View file @ 61fe90f9
......@@ -34,25 +34,12 @@ Licensed under the MIT License <http://opensource.org/licenses/MIT>.
#include <utility>
#include <vector>
// enable ssize_t on MinGW
#ifdef __GNUC__
#ifdef __MINGW32__
#include <sys/types.h>
#endif
#endif
// disable float-equal warnings on GCC/clang
#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wfloat-equal"
#endif
// enable ssize_t for MSVC
#ifdef _MSC_VER
#include <basetsd.h>
using ssize_t = SSIZE_T;
#endif
/*!
@brief namespace for Niels Lohmann
@see https://github.com/nlohmann
......@@ -7293,9 +7280,9 @@ class basic_json
return;
}
const ssize_t offset_start = m_start - m_content;
const ssize_t offset_marker = m_marker - m_start;
const ssize_t offset_cursor = m_cursor - m_start;
const auto offset_start = m_start - m_content;
const auto offset_marker = m_marker - m_start;
const auto offset_cursor = m_cursor - m_start;
m_buffer.erase(0, static_cast<size_t>(offset_start));
std::string line;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment