Skip to content

Fix build break in PSX for iswspace #955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PushpadantK wants to merge 2 commits into
base: main
Choose a base branch
from
+15 −1
Open

Fix build break in PSX for iswspace #955

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0784ae
fix build break in PSX for iswspace
PushpadantK Apr 3, 2026
67a75fb
Merge branch 'main' into pkacha/PSX-fix-iswspace
PushpadantK Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion Include/json_cpp/details/json_parsing.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@
* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
****/

#include <cctype>
#include <cstdlib>
#include <array>
#include <cwctype>
#include <type_traits>
#include "../json.h"

#if defined(_MSC_VER)
Expand Down Expand Up @@ -198,6 +201,17 @@ typename std::char_traits<CharType>::int_type eof()
return std::char_traits<CharType>::eof();
}

template <typename CharType>
bool is_whitespace_character(typename std::char_traits<CharType>::int_type ch)
{
if constexpr (std::is_same<CharType, wchar_t>::value)
{
return std::iswspace(static_cast<wint_t>(ch)) != 0;
}

return std::isspace(static_cast<unsigned char>(ch)) != 0;
}

template <typename CharType>
class JSON_StreamParser : public JSON_Parser<CharType>
{
Expand Down Expand Up @@ -305,7 +319,7 @@ typename JSON_Parser<CharType>::int_type JSON_Parser<CharType>::EatWhitespace()
{
auto ch = NextCharacter();

while ( ch != eof<CharType>() && iswspace(static_cast<wint_t>(ch)))
while ( ch != eof<CharType>() && is_whitespace_character<CharType>(ch))
{
ch = NextCharacter();
}
Expand Down
Loading