Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:USCiLab/cereal into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
AzothAmmo committed May 3, 2017
2 parents f031131 + 2ab15f7 commit ad90557
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion include/cereal/details/helpers.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ namespace cereal
{
//! Internally store the pointer as a void *, keeping const if created with
//! a const pointer
using PT = typename std::conditional<std::is_const<typename std::remove_pointer<T>::type>::value,
using PT = typename std::conditional<std::is_const<typename std::remove_pointer<typename std::remove_reference<T>::type>::type>::value,
const void *,
void *>::type;

Expand Down

0 comments on commit ad90557

Please sign in to comment.