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.

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

Feature remove variant array view #144

Merged
merged 4 commits into from
Mar 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/examples/json_serialization/to_json.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,11 @@ bool write_variant(const variant& var, PrettyWriter<StringBuffer>& writer)
is_wrapper ? var.extract_wrapped_value() : var, writer))
{
}
else if (value_type.is_array())
else if (var.is_sequential_container())
{
write_array(var.create_sequential_view(), writer);
}
else if (value_type.is_associative_container())
else if (var.is_associative_container())
{
write_associative_container(var.create_associative_view(), writer);
}
Expand Down
3 changes: 1 addition & 2 deletions src/rttr/argument.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ class instance;
class RTTR_API argument
{
template<typename T>
using decay_arg_t = detail::enable_if_t<!std::is_same<argument, T>::value &&
!std::is_same<variant_array_view, T>::value, T>;
using decay_arg_t = detail::enable_if_t<!std::is_same<argument, T>::value, T>;

template<typename T>
using is_variant = std::is_same<detail::remove_cv_t<detail::remove_reference_t<T>>, variant>;
Expand Down
180 changes: 0 additions & 180 deletions src/rttr/array_mapper.h

This file was deleted.

116 changes: 0 additions & 116 deletions src/rttr/detail/array/array_accessor.h

This file was deleted.

Loading