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

Experiment for replacing bdlb::NullableValue with std::pmr::optional #252

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Experiment for replacing bdlb::NullableValue with std::pmr::optional #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b04e60d
Experiment for replacing bdlb::NullableValue with std::pmr::optional
villevoutilainen Apr 18, 2019
fc55632
Fix test failures
villevoutilainen Apr 18, 2019
ebdafbd
making tests pass
Jun 24, 2019
87bf865
merge with ville's changes
Jun 26, 2019
34c2cc6
clean up test changes
Jun 26, 2019
28e6b11
first version of NullableValue inheriting from std::pmr::optional
Jun 26, 2019
a1df58c
nullable value inherits from pmr::optional;
Jul 2, 2019
5a6c6ca
porting std::pmroptional
Jul 12, 2019
89c8748
hooking-in uses_domain_allocator
Aug 2, 2019
cfe67f1
Further bug-fixes for NullableValue and its tests
villevoutilainen Aug 14, 2019
eaf99e7
adding local uses_allocator.h
Aug 14, 2019
36c1123
adding local uses_allocator.h
villevoutilainen Aug 14, 2019
66708bd
adding pmroptional implementation that matches the paper
Sep 16, 2019
f424a4b
adding pmroptional implementation that matches the paper
Sep 16, 2019
e8ebd6c
Merge branch 'master' into master
LadyNina Sep 16, 2019
8a889d3
Merge pull request #1 from LadyNina/master
villevoutilainen Oct 3, 2019
c76b70e
fixing merge problems
Oct 3, 2019
b0f71ac
Merge pull request #2 from LadyNina/master
villevoutilainen Oct 3, 2019
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
1,200 changes: 1,197 additions & 3 deletions groups/bdl/bdlb/bdlb_nullablevalue.h
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 36 additions & 4 deletions groups/bdl/bdlb/bdlb_nullablevalue.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,22 @@
using namespace BloombergLP;
using namespace bsl;

namespace std
{
/* template <typename _Alloc>
struct uses_allocator<bsl::string, _Alloc> : true_type {};
template <typename TYPE, typename _Alloc>
struct uses_allocator<bslalg::ConstructorProxy<bdlb::NullableValue<TYPE>>, _Alloc> : true_type {};
template <typename _Alloc>
struct uses_allocator<bsltf::AllocTestType, _Alloc> : true_type {};
template <typename _Alloc>
struct uses_allocator<bsltf::MovableAllocTestType, _Alloc> : true_type {};
template <typename _Alloc>
struct uses_allocator<bsltf::MoveOnlyAllocTestType, _Alloc> : true_type {};
template <typename _Alloc>
struct uses_allocator<bsltf::AllocBitwiseMoveableTestType, _Alloc> : true_type {};
*/}

// ============================================================================
// TEST PLAN
// ----------------------------------------------------------------------------
Expand Down Expand Up @@ -1312,6 +1328,15 @@ struct UsesBslmaAllocator<NonAssignableAllocTestType> : bsl::true_type {
} // close namespace bslma
} // close enterprise namespace

namespace std
{
template <typename _Alloc>
struct uses_allocator<NonAssignableAllocTestType, _Alloc> : true_type {};
;
template <class TYPE, class _Alloc>
struct uses_allocator<TmvipAa<TYPE>, _Alloc> : true_type {};
}


// ======================================
// class ConvertibleFromAllocatorTestType
Expand Down Expand Up @@ -1498,6 +1523,13 @@ struct UsesBslmaAllocator<ConvertibleFromAllocatorTestType> : bsl::true_type {
} // close namespace bslma
} // close enterprise namespace

namespace std
{
template <typename _Alloc>
struct uses_allocator<ConvertibleFromAllocatorTestType, _Alloc> : true_type {};
;
}

// ============================================================================
// GLOBAL TYPEDEFS/CONSTANTS FOR TESTING
// ----------------------------------------------------------------------------
Expand Down Expand Up @@ -1889,8 +1921,8 @@ void TestDriver<TEST_TYPE>::testCase24_withoutAllocator()
};
const int NUM_SPECS = sizeof SPECS / sizeof *SPECS;

Obj& (Obj::*operatorMAg) (bslmf::MovableRef<TEST_TYPE>) = &Obj::operator=;
(void) operatorMAg; // quash potential compiler warning
//Obj& (Obj::*operatorMAg) (bslmf::MovableRef<TEST_TYPE>) = &Obj::operator=;
//(void) operatorMAg; // quash potential compiler warning

if (verbose) printf("\nTesting move assignment (no allocator).\n");
{
Expand Down Expand Up @@ -3365,7 +3397,7 @@ void TestDriver<TEST_TYPE>::testCase21_withAllocator()
ASSERTV(SPEC, CONFIG, X == W);

// Verify subsequent manipulation of new object 'X'.
primaryManipulator(&mX, 'Z');
primaryManipulator(&mX, 'Z');
ASSERTV(SPEC, X != W);
ASSERTV(SPEC, X == Z);

Expand Down Expand Up @@ -7203,7 +7235,7 @@ int main(int argc, char *argv[])
{
Obj mX(&oa); const Obj& X = mX;
if (veryVeryVerbose) { T_ T_ P(X) }
ASSERT(X.isNull());
ASSERT(!mX.has_value());
ASSERT(0 == da.numBlocksTotal());
ASSERT(0 == oa.numBlocksTotal());
}
Expand Down
Loading