Skip to content
Snippets Groups Projects
Commit 93fcc8d5 authored by Dr. Felix Tobias Schindler's avatar Dr. Felix Tobias Schindler
Browse files

[functions.combined] updated name

parent 51d670d2
No related branches found
No related tags found
No related merge requests found
......@@ -257,6 +257,7 @@ public:
, right_(Common::make_unique<RightStorageType>(right))
, name_(nm.empty()
? SelectCombined<LeftType, RightType, comb>::type() + " of '" + left.name() + "' and '" + right.name()
+ "'"
: nm)
{
}
......@@ -266,7 +267,8 @@ public:
: left_(Common::make_unique<LeftStorageType>(left))
, right_(Common::make_unique<RightStorageType>(right))
, name_(nm.empty()
? SelectCombined<LeftType, RightType, comb>::type() + " of '" + left.name() + "' and '" + right.name()
? SelectCombined<LeftType, RightType, comb>::type() + " of '" + left_->storage_access().name()
+ "' and '" + right_->storage_access().name() + "'"
: nm)
{
}
......@@ -282,6 +284,8 @@ public:
ThisType& operator=(const ThisType& other) = delete;
ThisType& operator=(ThisType&& other) = delete;
virtual std::unique_ptr<LocalfunctionType> local_function(const EntityType& entity) const /*DS_OVERRIDE DS_FINAL*/
{
typedef CombinedLocalFunction<LeftType, RightType, comb> RealLocalFunctionType;
......@@ -297,7 +301,7 @@ public:
virtual std::string type() const DS_OVERRIDE DS_FINAL
{
return SelectCombined<LeftType, RightType, comb>::type() + " of '" + left_->storage_access().type() + "' and '"
+ right_->storage_access().type();
+ right_->storage_access().type() + "'";
} // ... type(...)
virtual std::string name() const DS_OVERRIDE DS_FINAL
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment