fix compilation issue

mingkaic · Jan 29, 2019 · f9e7691 · f9e7691
1 parent a6eff01
commit f9e7691
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/llo/opt/ops_merge.hpp b/llo/opt/ops_merge.hpp
@@ -10,7 +10,7 @@
 namespace llo
 {
 
-static const std::set<age::_GENERATED_OPCODE> nnary = {
+static const std::set<age::_GENERATED_OPCODE> nnary_codes = {
 	age::SUM,
 	age::PROD,
 	age::MIN,

diff --git a/llo/src/const_merge.cpp b/llo/src/const_merge.cpp
@@ -25,8 +25,8 @@ ade::TensptrT const_merge_edit (ade::Opcode opcode, ade::ArgsT args)
 		return ade::TensptrT(Constant::get(
 			(char*) tens->data(), age::DOUBLE, temp->shape()));
 	}
-	else if (nnary.find((age::_GENERATED_OPCODE) opcode.code_) != nnary.end() &&
-		cargs.size() > 2)
+	else if (nnary_codes.find((age::_GENERATED_OPCODE)
+		opcode.code_) != nnary_codes.end() && cargs.size() > 2)
 	{
 		ade::TensptrT temp(ade::Functor::get(opcode, args));
 		auto tens = llo::eval<double>(temp);

diff --git a/llo/src/ops_merge.cpp b/llo/src/ops_merge.cpp
@@ -33,7 +33,7 @@ static bool is_bijective (ade::CoordptrT coorder)
 
 ade::TensptrT ops_merge_edit (ade::Opcode opcode, ade::ArgsT args)
 {
-	if (nnary.end() != nnary.find((age::_GENERATED_OPCODE) opcode.code_))
+	if (nnary_codes.end() != nnary_codes.find((age::_GENERATED_OPCODE) opcode.code_))
 	{
 		bool merged = false;
 		ade::ArgsT newchildren;
@@ -97,7 +97,7 @@ ade::TensptrT ops_merge_edit (ade::Opcode opcode, ade::ArgsT args)
 				merged = true;
 			}
 			else if (arg_children.size() == 1 &&
-				nnary.end() != nnary.find(arg_op) &&
+				nnary_codes.end() != nnary_codes.find(arg_op) &&
 				arg_children[0].get_coorder()->is_bijective())
 			{
 				auto child = arg_children[0];