Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
540f2558
Y
YTBP
项目概览
YottaChain
/
YTBP
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
YTBP
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
540f2558
编写于
4月 29, 2018
作者:
D
Daniel Larimer
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'slim' of github.com:EOSIO/eos into slim
上级
596a27bd
e382dfd8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
1 deletion
+27
-1
libraries/chain/include/eosio/chain/abi_serializer.hpp
libraries/chain/include/eosio/chain/abi_serializer.hpp
+26
-0
libraries/chain/include/eosio/chain/trace.hpp
libraries/chain/include/eosio/chain/trace.hpp
+1
-1
未找到文件。
libraries/chain/include/eosio/chain/abi_serializer.hpp
浏览文件 @
540f2558
...
@@ -174,6 +174,19 @@ namespace impl {
...
@@ -174,6 +174,19 @@ namespace impl {
mvo
(
name
,
std
::
move
(
array
));
mvo
(
name
,
std
::
move
(
array
));
}
}
/**
* template which overloads add for shared_ptr of types which contain ABI information in their trees
* for these members we call ::add in order to trigger further processing
*/
template
<
typename
M
,
typename
Resolver
,
require_abi_t
<
M
>
=
1
>
static
void
add
(
mutable_variant_object
&
mvo
,
const
char
*
name
,
const
std
::
shared_ptr
<
M
>&
v
,
Resolver
resolver
)
{
if
(
!
v
)
return
;
mutable_variant_object
obj_mvo
;
add
(
obj_mvo
,
"_"
,
*
v
,
resolver
);
mvo
(
name
,
std
::
move
(
obj_mvo
[
"_"
]));
}
template
<
typename
Resolver
,
typename
...
Args
>
template
<
typename
Resolver
,
typename
...
Args
>
static
void
add
(
mutable_variant_object
&
mvo
,
const
char
*
name
,
const
fc
::
static_variant
<
Args
...
>&
v
,
Resolver
resolver
)
static
void
add
(
mutable_variant_object
&
mvo
,
const
char
*
name
,
const
fc
::
static_variant
<
Args
...
>&
v
,
Resolver
resolver
)
{
{
...
@@ -317,6 +330,19 @@ namespace impl {
...
@@ -317,6 +330,19 @@ namespace impl {
}
}
}
}
/**
* template which overloads extract for shared_ptr of types which contain ABI information in their trees
* for these members we call ::extract in order to trigger further processing
*/
template
<
typename
M
,
typename
Resolver
,
require_abi_t
<
M
>
=
1
>
static
void
extract
(
const
variant
&
v
,
std
::
shared_ptr
<
M
>&
o
,
Resolver
resolver
)
{
const
variant_object
&
vo
=
v
.
get_object
();
M
obj
;
extract
(
vo
,
obj
,
resolver
);
o
=
std
::
make_shared
<
M
>
(
obj
);
}
/**
/**
* Non templated overload that has priority for the action structure
* Non templated overload that has priority for the action structure
* this type has members which must be directly translated by the ABI so it is
* this type has members which must be directly translated by the ABI so it is
...
...
libraries/chain/include/eosio/chain/trace.hpp
浏览文件 @
540f2558
...
@@ -66,5 +66,5 @@ FC_REFLECT_DERIVED( eosio::chain::action_trace,
...
@@ -66,5 +66,5 @@ FC_REFLECT_DERIVED( eosio::chain::action_trace,
(
eosio
::
chain
::
base_action_trace
),
(
inline_traces
)
)
(
eosio
::
chain
::
base_action_trace
),
(
inline_traces
)
)
FC_REFLECT
(
eosio
::
chain
::
transaction_trace
,
(
id
)(
receipt
)(
elapsed
)(
net_usage
)(
cpu_usage
)(
scheduled
)(
action_traces
)
FC_REFLECT
(
eosio
::
chain
::
transaction_trace
,
(
id
)(
receipt
)(
elapsed
)(
net_usage
)(
cpu_usage
)(
scheduled
)(
action_traces
)
/*(failed_dtrx_trace)*/
(
soft_except
)(
hard_except
)
)
(
failed_dtrx_trace
)
(
soft_except
)(
hard_except
)
)
FC_REFLECT
(
eosio
::
chain
::
block_trace
,
(
elapsed
)(
cpu_usage
)(
trx_traces
)
)
FC_REFLECT
(
eosio
::
chain
::
block_trace
,
(
elapsed
)(
cpu_usage
)(
trx_traces
)
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录