-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[DAPHNE-#830] Fix compilation error (with clang) in json dependency
The use of EOF in our json dependency makes compilation fail with Clang. Patch is based on nlohmannjson version 3.11.3
- Loading branch information
1 parent
675dc0c
commit bec5254
Showing
3 changed files
with
23 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
--- json.hpp.orig 2024-09-24 17:26:47.850173669 +0200 | ||
+++ json.hpp 2024-09-24 17:27:40.874776913 +0200 | ||
@@ -3624,7 +3624,7 @@ | ||
|
||
static constexpr int_type eof() noexcept | ||
{ | ||
- return static_cast<int_type>(EOF); | ||
+ return static_cast<int_type>(std::char_traits<char>::eof()); | ||
} | ||
}; | ||
|
||
@@ -3648,7 +3648,7 @@ | ||
|
||
static constexpr int_type eof() noexcept | ||
{ | ||
- return static_cast<int_type>(EOF); | ||
+ return static_cast<int_type>(std::char_traits<char>::eof()); | ||
} | ||
}; | ||
|