From 1e233171ff59decc3d179e30ab29e65735583747 Mon Sep 17 00:00:00 2001
From: hedaoyuan <hedaoyuan@github.com>
Date: Mon, 16 Jan 2017 17:18:24 +0800
Subject: [PATCH] Fix merge error

---
 paddle/function/Function.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/paddle/function/Function.cpp b/paddle/function/Function.cpp
index 2632c17e3ac..f47d55a4ade 100644
--- a/paddle/function/Function.cpp
+++ b/paddle/function/Function.cpp
@@ -96,7 +96,8 @@ void BufferArgs::addArg(const GpuSparseMatrix& arg, ArgType argType) {
 void BufferArgs::addArg(const Matrix& matrix,
                         const IVector& vector,
                         ArgType argType) {
-  args_.push_back(std::make_shared<SequenceArg>(matrix, vector, argType));
+  _args_.push_back(new SequenceArg(matrix, vector, argType));
+  addArg(*_args_.back());
 }
 
 ClassRegistrar<FunctionBase> FunctionBase::funcRegistrar_;
-- 
GitLab