File tree Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -119,8 +119,9 @@ struct EquipmentUnion {
119
119
void Reset ();
120
120
121
121
#ifndef FLATBUFFERS_CPP98_STL
122
- template <typename T, typename RT = typename std::remove_reference<T>::type >
122
+ template <typename T>
123
123
void Set (T&& val) {
124
+ using RT = typename std::remove_reference<T>::type;
124
125
Reset ();
125
126
type = EquipmentTraits<typename RT::TableType>::enum_value;
126
127
if (type != Equipment_NONE) {
Original file line number Diff line number Diff line change @@ -1096,8 +1096,9 @@ class CppGenerator : public BaseGenerator {
1096
1096
code_ += " " ;
1097
1097
if (!enum_def.uses_multiple_type_instances ) {
1098
1098
code_ += " #ifndef FLATBUFFERS_CPP98_STL" ;
1099
- code_ += " template <typename T, typename RT = typename std::remove_reference<T>::type >" ;
1099
+ code_ += " template <typename T>" ;
1100
1100
code_ += " void Set(T&& val) {" ;
1101
+ code_ += " using RT = typename std::remove_reference<T>::type;" ;
1101
1102
code_ += " Reset();" ;
1102
1103
code_ += " type = {{NAME}}Traits<typename RT::TableType>::enum_value;" ;
1103
1104
code_ += " if (type != {{NONE}}) {" ;
Original file line number Diff line number Diff line change @@ -207,8 +207,9 @@ struct AnyUnion {
207
207
void Reset ();
208
208
209
209
#ifndef FLATBUFFERS_CPP98_STL
210
- template <typename T, typename RT = typename std::remove_reference<T>::type >
210
+ template <typename T>
211
211
void Set (T&& val) {
212
+ using RT = typename std::remove_reference<T>::type;
212
213
Reset ();
213
214
type = AnyTraits<typename RT::TableType>::enum_value;
214
215
if (type != Any_NONE) {
@@ -348,8 +349,9 @@ struct AnyUniqueAliasesUnion {
348
349
void Reset ();
349
350
350
351
#ifndef FLATBUFFERS_CPP98_STL
351
- template <typename T, typename RT = typename std::remove_reference<T>::type >
352
+ template <typename T>
352
353
void Set (T&& val) {
354
+ using RT = typename std::remove_reference<T>::type;
353
355
Reset ();
354
356
type = AnyUniqueAliasesTraits<typename RT::TableType>::enum_value;
355
357
if (type != AnyUniqueAliases_NONE) {
You can’t perform that action at this time.
0 commit comments