Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
flatbuffers
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
flatbuffers
Commits
640df2c1
Commit
640df2c1
authored
Apr 11, 2019
by
Wouter van Oortmerssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow Set() methods to handle reference types
Change-Id: I487ded77d28490189dd5d38236cb04bffaf5f11a
parent
60340ac5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
13 deletions
+12
-13
monster_generated.h
samples/monster_generated.h
+3
-3
idl_gen_cpp.cpp
src/idl_gen_cpp.cpp
+3
-4
monster_test_generated.h
tests/monster_test_generated.h
+6
-6
No files found.
samples/monster_generated.h
View file @
640df2c1
...
...
@@ -119,12 +119,12 @@ struct EquipmentUnion {
void
Reset
();
#ifndef FLATBUFFERS_CPP98_STL
template
<
typename
T
>
template
<
typename
T
,
typename
RT
=
typename
std
::
remove_reference
<
T
>::
type
>
void
Set
(
T
&&
val
)
{
Reset
();
type
=
EquipmentTraits
<
typename
T
::
TableType
>::
enum_value
;
type
=
EquipmentTraits
<
typename
R
T
::
TableType
>::
enum_value
;
if
(
type
!=
Equipment_NONE
)
{
value
=
new
T
(
std
::
forward
<
T
>
(
val
));
value
=
new
R
T
(
std
::
forward
<
T
>
(
val
));
}
}
#endif // FLATBUFFERS_CPP98_STL
...
...
src/idl_gen_cpp.cpp
View file @
640df2c1
...
...
@@ -1096,13 +1096,12 @@ class CppGenerator : public BaseGenerator {
code_
+=
""
;
if
(
!
enum_def
.
uses_multiple_type_instances
)
{
code_
+=
"#ifndef FLATBUFFERS_CPP98_STL"
;
code_
+=
" template <typename T>"
;
code_
+=
" template <typename T
, typename RT = typename std::remove_reference<T>::type
>"
;
code_
+=
" void Set(T&& val) {"
;
code_
+=
" Reset();"
;
code_
+=
" type = {{NAME}}Traits<typename T::TableType>::enum_value;"
;
code_
+=
" type = {{NAME}}Traits<typename RT::TableType>::enum_value;"
;
code_
+=
" if (type != {{NONE}}) {"
;
code_
+=
" value = new T(std::forward<T>(val));"
;
code_
+=
" value = new
R
T(std::forward<T>(val));"
;
code_
+=
" }"
;
code_
+=
" }"
;
code_
+=
"#endif // FLATBUFFERS_CPP98_STL"
;
...
...
tests/monster_test_generated.h
View file @
640df2c1
...
...
@@ -207,12 +207,12 @@ struct AnyUnion {
void
Reset
();
#ifndef FLATBUFFERS_CPP98_STL
template
<
typename
T
>
template
<
typename
T
,
typename
RT
=
typename
std
::
remove_reference
<
T
>::
type
>
void
Set
(
T
&&
val
)
{
Reset
();
type
=
AnyTraits
<
typename
T
::
TableType
>::
enum_value
;
type
=
AnyTraits
<
typename
R
T
::
TableType
>::
enum_value
;
if
(
type
!=
Any_NONE
)
{
value
=
new
T
(
std
::
forward
<
T
>
(
val
));
value
=
new
R
T
(
std
::
forward
<
T
>
(
val
));
}
}
#endif // FLATBUFFERS_CPP98_STL
...
...
@@ -348,12 +348,12 @@ struct AnyUniqueAliasesUnion {
void
Reset
();
#ifndef FLATBUFFERS_CPP98_STL
template
<
typename
T
>
template
<
typename
T
,
typename
RT
=
typename
std
::
remove_reference
<
T
>::
type
>
void
Set
(
T
&&
val
)
{
Reset
();
type
=
AnyUniqueAliasesTraits
<
typename
T
::
TableType
>::
enum_value
;
type
=
AnyUniqueAliasesTraits
<
typename
R
T
::
TableType
>::
enum_value
;
if
(
type
!=
AnyUniqueAliases_NONE
)
{
value
=
new
T
(
std
::
forward
<
T
>
(
val
));
value
=
new
R
T
(
std
::
forward
<
T
>
(
val
));
}
}
#endif // FLATBUFFERS_CPP98_STL
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment