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
105dd528
Commit
105dd528
authored
Nov 07, 2019
by
Derek Bailey
Committed by
Wouter van Oortmerssen
Nov 07, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change monster_extra generation to use flatbuffers::unique_ptr (#5612)
parent
f0f0efe7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
generate_code.bat
tests/generate_code.bat
+1
-1
generate_code.sh
tests/generate_code.sh
+1
-1
monster_extra_generated.h
tests/monster_extra_generated.h
+4
-4
No files found.
tests/generate_code.bat
View file @
105dd528
...
@@ -26,7 +26,7 @@ if "%1"=="-b" set buildtype=%2
...
@@ -26,7 +26,7 @@ if "%1"=="-b" set buildtype=%2
IF NOT "%MONSTER_EXTRA%"=="skip" (
IF NOT "%MONSTER_EXTRA%"=="skip" (
@echo Generate MosterExtra
@echo Generate MosterExtra
..\%buildtype%\flatc.exe --cpp --java --csharp --python --gen-mutable --reflect-names --gen-object-api --gen-compare --no-includes monster_extra.fbs monsterdata_extra.json || goto FAIL
..\%buildtype%\flatc.exe --cpp --java --csharp --python --gen-mutable --reflect-names --gen-object-api --gen-compare --no-includes
--cpp-ptr-type flatbuffers::unique_ptr
monster_extra.fbs monsterdata_extra.json || goto FAIL
) else (
) else (
@echo monster_extra.fbs skipped (the strtod function from MSVC2013 or older doesn't support NaN/Inf arguments)
@echo monster_extra.fbs skipped (the strtod function from MSVC2013 or older doesn't support NaN/Inf arguments)
)
)
...
...
tests/generate_code.sh
View file @
105dd528
...
@@ -21,7 +21,7 @@ set -e
...
@@ -21,7 +21,7 @@ set -e
../flatc
-b
--schema
--bfbs-comments
--bfbs-builtins
-I
include_test monster_test.fbs
../flatc
-b
--schema
--bfbs-comments
--bfbs-builtins
-I
include_test monster_test.fbs
../flatc
-b
--schema
--bfbs-comments
--bfbs-builtins
-I
include_test arrays_test.fbs
../flatc
-b
--schema
--bfbs-comments
--bfbs-builtins
-I
include_test arrays_test.fbs
../flatc
--jsonschema
--schema
-I
include_test monster_test.fbs
../flatc
--jsonschema
--schema
-I
include_test monster_test.fbs
../flatc
--cpp
--java
--kotlin
--csharp
--python
--gen-mutable
--reflect-names
--gen-object-api
--gen-compare
--no-includes
monster_extra.fbs monsterdata_extra.json
../flatc
--cpp
--java
--kotlin
--csharp
--python
--gen-mutable
--reflect-names
--gen-object-api
--gen-compare
--no-includes
--cpp-ptr-type
flatbuffers::unique_ptr
monster_extra.fbs monsterdata_extra.json
../flatc
--cpp
--java
--csharp
--python
--gen-mutable
--reflect-names
--gen-object-api
--gen-compare
--no-includes
--scoped-enums
--jsonschema
--cpp-ptr-type
flatbuffers::unique_ptr arrays_test.fbs
../flatc
--cpp
--java
--csharp
--python
--gen-mutable
--reflect-names
--gen-object-api
--gen-compare
--no-includes
--scoped-enums
--jsonschema
--cpp-ptr-type
flatbuffers::unique_ptr arrays_test.fbs
cd
../samples
cd
../samples
../flatc
--cpp
--lobster
--gen-mutable
--reflect-names
--gen-object-api
--gen-compare
--cpp-ptr-type
flatbuffers::unique_ptr monster.fbs
../flatc
--cpp
--lobster
--gen-mutable
--reflect-names
--gen-object-api
--gen-compare
--cpp-ptr-type
flatbuffers::unique_ptr monster.fbs
...
...
tests/monster_extra_generated.h
View file @
105dd528
...
@@ -389,16 +389,16 @@ inline void FinishSizePrefixedMonsterExtraBuffer(
...
@@ -389,16 +389,16 @@ inline void FinishSizePrefixedMonsterExtraBuffer(
fbb
.
FinishSizePrefixed
(
root
,
MonsterExtraIdentifier
());
fbb
.
FinishSizePrefixed
(
root
,
MonsterExtraIdentifier
());
}
}
inline
std
::
unique_ptr
<
MyGame
::
MonsterExtraT
>
UnPackMonsterExtra
(
inline
flatbuffers
::
unique_ptr
<
MyGame
::
MonsterExtraT
>
UnPackMonsterExtra
(
const
void
*
buf
,
const
void
*
buf
,
const
flatbuffers
::
resolver_function_t
*
res
=
nullptr
)
{
const
flatbuffers
::
resolver_function_t
*
res
=
nullptr
)
{
return
std
::
unique_ptr
<
MyGame
::
MonsterExtraT
>
(
GetMonsterExtra
(
buf
)
->
UnPack
(
res
));
return
flatbuffers
::
unique_ptr
<
MyGame
::
MonsterExtraT
>
(
GetMonsterExtra
(
buf
)
->
UnPack
(
res
));
}
}
inline
std
::
unique_ptr
<
MyGame
::
MonsterExtraT
>
UnPackSizePrefixedMonsterExtra
(
inline
flatbuffers
::
unique_ptr
<
MyGame
::
MonsterExtraT
>
UnPackSizePrefixedMonsterExtra
(
const
void
*
buf
,
const
void
*
buf
,
const
flatbuffers
::
resolver_function_t
*
res
=
nullptr
)
{
const
flatbuffers
::
resolver_function_t
*
res
=
nullptr
)
{
return
std
::
unique_ptr
<
MyGame
::
MonsterExtraT
>
(
GetSizePrefixedMonsterExtra
(
buf
)
->
UnPack
(
res
));
return
flatbuffers
::
unique_ptr
<
MyGame
::
MonsterExtraT
>
(
GetSizePrefixedMonsterExtra
(
buf
)
->
UnPack
(
res
));
}
}
}
// namespace MyGame
}
// namespace MyGame
...
...
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