diff options
| author |   imarom <imarom@cisco.com> | 2016-02-23 03:21:07 -0500 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2016-02-23 03:32:19 -0500 |
| commit | a420b4c469c49c01c5de6756e2955beb4c714728 (patch) | |
| tree | 2e2ef60c69f55ed913c3a4e9468f030866d4c3aa /src/rpc-server/commands/trex_rpc_cmd_stream.cpp | |
| parent | eb899885b5e4c551550275e8aa46061aefd6b37e (diff) | |
conflicts
Diffstat (limited to 'src/rpc-server/commands/trex_rpc_cmd_stream.cpp')
| -rw-r--r-- | src/rpc-server/commands/trex_rpc_cmd_stream.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpc-server/commands/trex_rpc_cmd_stream.cpp b/src/rpc-server/commands/trex_rpc_cmd_stream.cpp index 0918ff0e..50295c7c 100644 --- a/src/rpc-server/commands/trex_rpc_cmd_stream.cpp +++ b/src/rpc-server/commands/trex_rpc_cmd_stream.cpp @@ -313,7 +313,7 @@ TrexRpcCmdAddStream::parse_vm_instr_flow_var(const Json::Value &inst, std::uniqu void -TrexRpcCmdAddStream::parse_vm_instr_write_mask_flow_var(const Json::Value &inst, TrexStream *stream, Json::Value &result) { +TrexRpcCmdAddStream::parse_vm_instr_write_mask_flow_var(const Json::Value &inst, std::unique_ptr<TrexStream> &stream, Json::Value &result) { std::string flow_var_name = parse_string(inst, "name", result); uint16_t pkt_offset = parse_uint16(inst, "pkt_offset", result); uint16_t pkt_cast_size = parse_uint16(inst, "pkt_cast_size", result); |