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
d07a3d2f
Commit
d07a3d2f
authored
Apr 11, 2019
by
Wouter van Oortmerssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed VS2010 build.
Change-Id: I3ee68c5f250d6baa02060ab2ecbc0f0fe254a9d8
parent
640df2c1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
monster_generated.h
samples/monster_generated.h
+2
-1
idl_gen_cpp.cpp
src/idl_gen_cpp.cpp
+2
-1
monster_test_generated.h
tests/monster_test_generated.h
+4
-2
No files found.
samples/monster_generated.h
View file @
d07a3d2f
...
@@ -119,8 +119,9 @@ struct EquipmentUnion {
...
@@ -119,8 +119,9 @@ struct EquipmentUnion {
void
Reset
();
void
Reset
();
#ifndef FLATBUFFERS_CPP98_STL
#ifndef FLATBUFFERS_CPP98_STL
template
<
typename
T
,
typename
RT
=
typename
std
::
remove_reference
<
T
>::
type
>
template
<
typename
T
>
void
Set
(
T
&&
val
)
{
void
Set
(
T
&&
val
)
{
using
RT
=
typename
std
::
remove_reference
<
T
>::
type
;
Reset
();
Reset
();
type
=
EquipmentTraits
<
typename
RT
::
TableType
>::
enum_value
;
type
=
EquipmentTraits
<
typename
RT
::
TableType
>::
enum_value
;
if
(
type
!=
Equipment_NONE
)
{
if
(
type
!=
Equipment_NONE
)
{
...
...
src/idl_gen_cpp.cpp
View file @
d07a3d2f
...
@@ -1096,8 +1096,9 @@ class CppGenerator : public BaseGenerator {
...
@@ -1096,8 +1096,9 @@ class CppGenerator : public BaseGenerator {
code_
+=
""
;
code_
+=
""
;
if
(
!
enum_def
.
uses_multiple_type_instances
)
{
if
(
!
enum_def
.
uses_multiple_type_instances
)
{
code_
+=
"#ifndef FLATBUFFERS_CPP98_STL"
;
code_
+=
"#ifndef FLATBUFFERS_CPP98_STL"
;
code_
+=
" template <typename T
, typename RT = typename std::remove_reference<T>::type
>"
;
code_
+=
" template <typename T>"
;
code_
+=
" void Set(T&& val) {"
;
code_
+=
" void Set(T&& val) {"
;
code_
+=
" using RT = typename std::remove_reference<T>::type;"
;
code_
+=
" Reset();"
;
code_
+=
" Reset();"
;
code_
+=
" type = {{NAME}}Traits<typename RT::TableType>::enum_value;"
;
code_
+=
" type = {{NAME}}Traits<typename RT::TableType>::enum_value;"
;
code_
+=
" if (type != {{NONE}}) {"
;
code_
+=
" if (type != {{NONE}}) {"
;
...
...
tests/monster_test_generated.h
View file @
d07a3d2f
...
@@ -207,8 +207,9 @@ struct AnyUnion {
...
@@ -207,8 +207,9 @@ struct AnyUnion {
void
Reset
();
void
Reset
();
#ifndef FLATBUFFERS_CPP98_STL
#ifndef FLATBUFFERS_CPP98_STL
template
<
typename
T
,
typename
RT
=
typename
std
::
remove_reference
<
T
>::
type
>
template
<
typename
T
>
void
Set
(
T
&&
val
)
{
void
Set
(
T
&&
val
)
{
using
RT
=
typename
std
::
remove_reference
<
T
>::
type
;
Reset
();
Reset
();
type
=
AnyTraits
<
typename
RT
::
TableType
>::
enum_value
;
type
=
AnyTraits
<
typename
RT
::
TableType
>::
enum_value
;
if
(
type
!=
Any_NONE
)
{
if
(
type
!=
Any_NONE
)
{
...
@@ -348,8 +349,9 @@ struct AnyUniqueAliasesUnion {
...
@@ -348,8 +349,9 @@ struct AnyUniqueAliasesUnion {
void
Reset
();
void
Reset
();
#ifndef FLATBUFFERS_CPP98_STL
#ifndef FLATBUFFERS_CPP98_STL
template
<
typename
T
,
typename
RT
=
typename
std
::
remove_reference
<
T
>::
type
>
template
<
typename
T
>
void
Set
(
T
&&
val
)
{
void
Set
(
T
&&
val
)
{
using
RT
=
typename
std
::
remove_reference
<
T
>::
type
;
Reset
();
Reset
();
type
=
AnyUniqueAliasesTraits
<
typename
RT
::
TableType
>::
enum_value
;
type
=
AnyUniqueAliasesTraits
<
typename
RT
::
TableType
>::
enum_value
;
if
(
type
!=
AnyUniqueAliases_NONE
)
{
if
(
type
!=
AnyUniqueAliases_NONE
)
{
...
...
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