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

Develop #423

Merged
merged 18 commits into from
Nov 20, 2017
Merged

Develop #423

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
63eee81
fix behavior for deserializing sharedptr to const obj
Jun 30, 2017
508b020
fix compiler warnings
Jul 10, 2017
ae9b106
select correct remplate for std::vector<bool> and acknowledge that st…
WSoptics Aug 10, 2017
8e25c2b
replace std::decay_t<T> with std::decay<T>::type for C++11 compatibility
WSoptics Aug 11, 2017
1947a96
remove useless copies and move when appropriate
WSoptics Aug 11, 2017
70754e2
replace noexcept with CEREAL_NOEXCEPT
WSoptics Aug 14, 2017
015ed43
remove superfluous semicolon
WSoptics Aug 16, 2017
673add1
add unit tests for std::shared_ptr<const T>
WSoptics Aug 16, 2017
0481881
add unit tests for std::unique_ptr<T>
WSoptics Aug 16, 2017
ca5cd7e
add (non-compiling) unit tests for std::unique_ptr<const T>
WSoptics Aug 16, 2017
e84a673
fix std::unique_ptr<const T>
WSoptics Aug 16, 2017
c3eda13
replace std::decay with std::remove_const
WSoptics Aug 17, 2017
d5b2126
make CEREAL_CLASS_VERSION not create a warning (-Wunused-member-funct…
WSoptics Aug 22, 2017
43077e7
correctly use std::streamsize instead of std::size_t in PortableBinar…
WSoptics Aug 24, 2017
ebbf3a6
fix -Wconversion warning in gcc7
WSoptics Aug 28, 2017
c0f2e28
correct std::size_t to std::streamsize to avoid clang warning
WSoptics Sep 8, 2017
f5a9404
explicitly enable copy ctor to keep clang from warning
WSoptics Sep 8, 2017
11882b6
make CEREAL_BIND_TO_ARCHIVES not have an unused function under GNU C …
WSoptics Sep 8, 2017
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
Prev Previous commit
Next Next commit
replace std::decay with std::remove_const
  • Loading branch information
@WSoptics
WSoptics committed Aug 17, 2017
commit c3eda13e9eb6c6fa53d8820b6b4c55c0f21ff55e
17 changes: 9 additions & 8 deletions include/cereal/types/memory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ namespace cereal

// Allocate our storage, which we will treat as
// uninitialized until initialized with placement new
std::shared_ptr<typename std::decay<T>::type> ptr(reinterpret_cast<T *>(new ST()),
std::shared_ptr<typename std::remove_const<T>::type> ptr(reinterpret_cast<T *>(new ST()),
[=]( T * t )
{
if( *valid )
Expand All @@ -315,7 +315,7 @@ namespace cereal
wrapper.ptr = std::move(ptr);
}
else
wrapper.ptr = std::static_pointer_cast<typename std::decay<T>::type>(ar.getSharedPointer(id));
wrapper.ptr = std::static_pointer_cast<typename std::remove_const<T>::type>(ar.getSharedPointer(id));
}

//! Loading std::shared_ptr, case when no user load and construct (wrapper implementation)
Expand All @@ -330,7 +330,8 @@ namespace cereal

if( id & detail::msb_32bit )
{
std::shared_ptr<typename std::decay<T>::type> ptr( detail::Construct<typename std::decay<T>::type, Archive>::load_andor_construct() );
using NonConstT = typename std::remove_const<T>::type;
std::shared_ptr<NonConstT> ptr( detail::Construct<NonConstT, Archive>::load_andor_construct() );
ar.registerSharedPointer( id, ptr );
ar( CEREAL_NVP_("data", *ptr) );
wrapper.ptr = std::move(ptr);
Expand Down Expand Up @@ -372,17 +373,17 @@ namespace cereal

if( isValid )
{
using DecayT = typename std::decay<T>::type;
using NonConstT = typename std::remove_const<T>::type;
// Storage type for the pointer - since we can't default construct this type,
// we'll allocate it using std::aligned_storage
using ST = typename std::aligned_storage<sizeof(DecayT), CEREAL_ALIGNOF(DecayT)>::type;
using ST = typename std::aligned_storage<sizeof(NonConstT), CEREAL_ALIGNOF(NonConstT)>::type;

// Allocate storage - note the ST type so that deleter is correct if
// an exception is thrown before we are initialized
std::unique_ptr<ST> stPtr( new ST() );

// Use wrapper to enter into "data" nvp of ptr_wrapper
memory_detail::LoadAndConstructLoadWrapper<Archive, DecayT> loadWrapper( reinterpret_cast<DecayT *>( stPtr.get() ) );
memory_detail::LoadAndConstructLoadWrapper<Archive, NonConstT> loadWrapper( reinterpret_cast<NonConstT *>( stPtr.get() ) );

// Initialize storage
ar( CEREAL_NVP_("data", loadWrapper) );
Expand All @@ -405,8 +406,8 @@ namespace cereal

if( isValid )
{
using DecayT = typename std::decay<T>::type;
std::unique_ptr<DecayT, D> ptr( detail::Construct<DecayT, Archive>::load_andor_construct() );
using NonConstT = typename std::remove_const<T>::type;
std::unique_ptr<NonConstT, D> ptr( detail::Construct<NonConstT, Archive>::load_andor_construct() );
ar( CEREAL_NVP_( "data", *ptr ) );
wrapper.ptr = std::move(ptr);
}
Expand Down