From a420b4c469c49c01c5de6756e2955beb4c714728 Mon Sep 17 00:00:00 2001
From: imarom <imarom@cisco.com>
Date: Tue, 23 Feb 2016 03:21:07 -0500
Subject: conflicts

---
 src/rpc-server/commands/trex_rpc_cmd_stream.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/rpc-server/commands/trex_rpc_cmd_stream.cpp')

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);
-- 
cgit 1.2.3-korg