-
-
Notifications
You must be signed in to change notification settings - Fork 7.1k
Possible fix for #4485 #4487
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.
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
Merged
Merged
Possible fix for #4485 #4487
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
17bd783
Possible fix for #4485
jordan-hoang 62bc8f8
quick cleanup
jordan-hoang 8386c26
Fix compile issues
jordan-hoang ae4d67d
moved tests around, changed exceptions, removed a possibly unneeded i…
jordan-hoang 530e063
add back include <memory> for testing something
jordan-hoang f99b05a
Ninja doesn't like not having a \n, at end of file, adding it back
jordan-hoang 3c58f91
Merge branch 'nlohmann:develop' into fix-#4485
jordan-hoang d3c98ae
Merge branch 'develop' into fix-#4485
jordan-hoang 2b85d07
Merge branch 'develop' into fix-#4485
jordan-hoang b6344fe
Merge branch 'develop' into fix-#4485
jordan-hoang 557c8eb
update input_adapter file to deal with empty/null file ptr.
jordan-hoang fe877cc
ran make pretty
jordan-hoang 11f5ce0
added test for inputadapter
jordan-hoang 529d19c
ran make amalgamate
jordan-hoang c81514c
Update tests/src/unit-deserialization.cpp
jordan-hoang 8f4f265
Update tests/src/unit-deserialization.cpp
jordan-hoang d884284
Update input adapters.hpp with new includes
jordan-hoang ee774a3
Merge branch 'fix-#4485' of https://github.com/jordan-hoang/json into…
jordan-hoang d121495
fix unabigious use of _, (there was a double declare)
jordan-hoang 8ca7ea7
did the amalagamate
jordan-hoang 1dfb9e7
rm duplicate includes
jordan-hoang 0bd5c79
Merge branch 'fix-#4485' of https://github.com/jordan-hoang/json into…
jordan-hoang fd1f3b8
make amalgamate again
jordan-hoang fc89258
reorder
jordan-hoang e69cae3
amalgamate
jordan-hoang 7e302f7
moved it above
jordan-hoang 7f3c748
Merge branch 'fix-#4485' of https://github.com/jordan-hoang/json into…
jordan-hoang 97c4eac
amalgamate
jordan-hoang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.