Skip to content
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

Fix GCC 11 compatibility issue #658

Closed
wants to merge 2 commits into from
Closed

Fix GCC 11 compatibility issue #658

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
279c17d
Fix GCC 11 compatibility issue
abougouffa May 24, 2021
72f21a2
Fix comp error: 'numeric_limits' is not a member of 'std'
abougouffa Aug 16, 2021
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
18 changes: 9 additions & 9 deletions include/pangolin/utils/picojson.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,8 @@ class value {
private:
template <typename T> value(const T*); // intentionally defined to block implicit conversion of pointer to bool
template <typename Iter> static void _indent(Iter os, int indent);
template <typename Iter> void _serialize(Iter os, int indent) const;
std::string _serialize(int indent) const;
template <typename Iter> void serialize_(Iter os, int indent) const;
std::string serialize_(int indent) const;
};

typedef value::array array;
Expand Down Expand Up @@ -561,11 +561,11 @@ template <typename Iter> void serialize_str(const std::string& s, Iter oi) {
}

template <typename Iter> void value::serialize(Iter oi, bool prettify) const {
return _serialize(oi, prettify ? 0 : -1);
return serialize_(oi, prettify ? 0 : -1);
}

inline std::string value::serialize(bool prettify) const {
return _serialize(prettify ? 0 : -1);
return serialize_(prettify ? 0 : -1);
}

template <typename Iter> void value::_indent(Iter oi, int indent) {
Expand All @@ -575,7 +575,7 @@ template <typename Iter> void value::_indent(Iter oi, int indent) {
}
}

template <typename Iter> void value::_serialize(Iter oi, int indent) const {
template <typename Iter> void value::serialize_(Iter oi, int indent) const {
switch (type_) {
case string_type:
serialize_str(*u_.string_, oi);
Expand All @@ -594,7 +594,7 @@ template <typename Iter> void value::_serialize(Iter oi, int indent) const {
if (indent != -1) {
_indent(oi, indent);
}
i->_serialize(oi, indent);
i->serialize_(oi, indent);
}
if (indent != -1) {
--indent;
Expand Down Expand Up @@ -624,7 +624,7 @@ template <typename Iter> void value::_serialize(Iter oi, int indent) const {
if (indent != -1) {
*oi++ = ' ';
}
i->second._serialize(oi, indent);
i->second.serialize_(oi, indent);
}
if (indent != -1) {
--indent;
Expand All @@ -644,9 +644,9 @@ template <typename Iter> void value::_serialize(Iter oi, int indent) const {
}
}

inline std::string value::_serialize(int indent) const {
inline std::string value::serialize_(int indent) const {
std::string s;
_serialize(std::back_inserter(s), indent);
serialize_(std::back_inserter(s), indent);
return s;
}

Expand Down