From 8a5ee462a53f7a59edd9dbc5388a60cfab7c1e99 Mon Sep 17 00:00:00 2001
From: fengjiayi <fengjiayi@baidu.com>
Date: Thu, 20 Jul 2017 10:59:16 +0800
Subject: [PATCH] Fix some compile errors

---
 paddle/framework/grad_op_creator.h | 12 +++++++-----
 paddle/framework/op_registry.h     |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/paddle/framework/grad_op_creator.h b/paddle/framework/grad_op_creator.h
index 441aae49794..456b066f1d0 100644
--- a/paddle/framework/grad_op_creator.h
+++ b/paddle/framework/grad_op_creator.h
@@ -8,6 +8,8 @@ namespace framework {
 class OpRegistry;
 
 class GradOpCreator {
+  using VarIndexMap = std::unordered_map<std::string, int>;
+
  public:
   GradOpCreator(const OperatorBase* op) : op_(op) {}
   OperatorBase* Create();
@@ -32,15 +34,15 @@ class GradOpCreator {
   };
 
   OpInOutArg* BuildArg(const VarProto& var, const VarIndexMap& var_map,
-                       const vector<int>& format, InOutType type);
+                       const std::vector<int>& format, InOutType type);
   void BuildOpInOutArgList();
-  void PushArgIntoGradOp(const OpInOutArg* arg, vector<std::string>& in_out,
-                         vector<int>& format, VarIndexMap* varmap, int& idx,
-                         bool is_grad);
+  void AddArgIntoGradOp(const OpInOutArg* arg, std::vector<std::string>& in_out,
+                        std::vector<int>& format, VarIndexMap* varmap, int& idx,
+                        bool is_grad);
   void CompleteGradOp(OperatorBase* grad_op) const;
   const OperatorBase* op_;
   std::vector<std::shared_ptr<OpInOutArg>> arg_list_;
-}
+};
 
 }  // namespace framework
 }  // namespace paddle
diff --git a/paddle/framework/op_registry.h b/paddle/framework/op_registry.h
index fcb529bbac4..fffef31be34 100644
--- a/paddle/framework/op_registry.h
+++ b/paddle/framework/op_registry.h
@@ -6,7 +6,7 @@
 #include <unordered_map>
 #include <unordered_set>
 #include "paddle/framework/attr_checker.h"
-#include "paddle/framework/grad_op_creater.h"
+#include "paddle/framework/grad_op_creator.h"
 #include "paddle/framework/op_desc.pb.h"
 #include "paddle/framework/scope.h"
 
-- 
GitLab