Closed trofi closed 1 year ago
your changes in a5b09d5 is correct. Somehow the rebind part didn't get merged. I created PR #3966 for the missed change.
I'm confused. Can you clarify why you need your PR? It looks incomplete compared to this one and will create a conflict if merged.
I'm confused. Can you clarify why you need your PR? It looks incomplete compared to this one and will create a conflict if merged.
You haven't pushed the struct rebind other part. I can close my PR if you merge the struct rebind.
I'm confused. Can you clarify why you need your PR? It looks incomplete compared to this one and will create a conflict if merged.
You haven't pushed the struct rebind other part. I can close my PR if you merge the struct rebind.
Can you clarify where you expect it to be? https://github.com/nlohmann/json/commit/a5b09d50b786638ed9deb09ef13860a3cb64eb6b.patch does show rebind::other
presence for both classes:
diff --git a/tests/src/unit-allocator.cpp b/tests/src/unit-allocator.cpp
index c6b77ed669..c3708e89e3 100644
--- a/tests/src/unit-allocator.cpp
+++ b/tests/src/unit-allocator.cpp
@@ -20,11 +20,20 @@ struct bad_allocator : std::allocator<T>
{
using std::allocator<T>::allocator;
+ bad_allocator() = default;
+ template<class U> bad_allocator(const bad_allocator<U>& /*unused*/) { }
+
template<class... Args>
void construct(T* /*unused*/, Args&& ... /*unused*/)
{
throw std::bad_alloc();
}
+
+ template <class U>
+ struct rebind
+ {
+ using other = bad_allocator<U>;
+ };
};
} // namespace
--- a/tests/src/unit-regression2.cpp
+++ b/tests/src/unit-regression2.cpp
@@ -187,6 +187,15 @@ class my_allocator : public std::allocator<T>
{
public:
using std::allocator<T>::allocator;
+
+ my_allocator() = default;
+ template<class U> my_allocator(const my_allocator<U>& /*unused*/) { }
+
+ template <class U>
+ struct rebind
+ {
+ using other = my_allocator<U>;
+ };
};
/////////////////////////////////////////////////////////////////////
Do you expect more code here? Or somewhere else?
I'm confused. Can you clarify why you need your PR? It looks incomplete compared to this one and will create a conflict if merged.
You haven't pushed the struct rebind other part. I can close my PR if you merge the struct rebind.
Can you clarify where you expect it to be? https://github.com/nlohmann/json/commit/a5b09d50b786638ed9deb09ef13860a3cb64eb6b.patch does show
rebind::other
presence for both classes:Do you expect more code here? Or somewhere else?
See this link https://github.com/nlohmann/json/compare/274f83e115b0e9af8f98f940b927d83455ba419b..a5b09d50b786638ed9deb09ef13860a3cb64eb6b
I still don't follow. Sorry.
I still don't follow. Sorry.
Are your changes merged to develop branch ?
No. This is an open PR against develop branch.
No. This is an open PR against develop branch.
Ok, i closed mine. I can confirm your changes work.
Thanks a lot!
gcc-13
added an assert to standard headers to make sure custom allocators have intended implementation of rebind type instead of inherited rebind. gcc change: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7Without the fix build fails on this week's
gcc-13
as:The change adds trivial
rebind
definition with expected return type.[Describe your pull request here. Please read the text below the line, and make sure you follow the checklist.]
Pull request checklist
Read the Contribution Guidelines for detailed information.
include/nlohmann
directory, runmake amalgamate
to create the single-header filessingle_include/nlohmann/json.hpp
andsingle_include/nlohmann/json_fwd.hpp
. The whole process is described here.Please don't
#ifdef
s or other means.