diff options
Diffstat (limited to 'src/expr/expr_manager_template.cpp')
| -rw-r--r-- | src/expr/expr_manager_template.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/expr/expr_manager_template.cpp b/src/expr/expr_manager_template.cpp index d36ff5a3d..1eb94140d 100644 --- a/src/expr/expr_manager_template.cpp +++ b/src/expr/expr_manager_template.cpp @@ -650,20 +650,20 @@ DatatypeType ExprManager::mkDatatypeType(Datatype& datatype) { // code anyway. vector<Datatype> datatypes; datatypes.push_back(datatype); - std::vector<DatatypeType> result; - mkMutualDatatypeTypes(datatypes, result); + std::vector<DatatypeType> result = mkMutualDatatypeTypes(datatypes); Assert(result.size() == 1); return result.front(); } -void ExprManager::mkMutualDatatypeTypes(std::vector<Datatype>& datatypes, std::vector<DatatypeType>& dtts) { +std::vector<DatatypeType> ExprManager::mkMutualDatatypeTypes(std::vector<Datatype>& datatypes) { std::set<Type> unresolvedTypes; - return mkMutualDatatypeTypes(datatypes, unresolvedTypes, dtts); + return mkMutualDatatypeTypes(datatypes, unresolvedTypes); } -void ExprManager::mkMutualDatatypeTypes(std::vector<Datatype>& datatypes, std::set<Type>& unresolvedTypes, std::vector<DatatypeType>& dtts) { +std::vector<DatatypeType> ExprManager::mkMutualDatatypeTypes(std::vector<Datatype>& datatypes, std::set<Type>& unresolvedTypes) { NodeManagerScope nms(d_nodeManager); std::map<std::string, DatatypeType> nameResolutions; + std::vector<DatatypeType> dtts; Trace("ajr-temp") << "Build datatypes..." << std::endl; //have to build deep copy so that datatypes will live in NodeManager @@ -778,6 +778,7 @@ void ExprManager::mkMutualDatatypeTypes(std::vector<Datatype>& datatypes, std::s } Trace("ajr-temp") << "Finish..." << std::endl; + return dtts; } void ExprManager::checkResolvedDatatype(DatatypeType dtt) const { |