diff options
author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-11-24 14:52:41 +0900 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-11-25 10:39:00 +0000 |
commit | 491b293b07e59f69f2c8d9721ac6a098844d590d (patch) | |
tree | e954374edbf641b1b7466246c378f84a12090fcd | |
parent | 6f8feb9cccbf130339cf118a61512feb8a0424c8 (diff) |
Remove pass-by-value from RulesApplicator
References were assigned to a temporary object
This amends 936eee744
Change-Id: I1d2b6c00cd75ddb4759017490fd63ab123be4825
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/lib/corelib/buildgraph/rulesapplicator.cpp | 9 | ||||
-rw-r--r-- | src/lib/corelib/buildgraph/rulesapplicator.h | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp index 16aa0c001..e7362849a 100644 --- a/src/lib/corelib/buildgraph/rulesapplicator.cpp +++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp @@ -79,12 +79,13 @@ namespace Internal { RulesApplicator::RulesApplicator( ResolvedProductPtr product, - std::unordered_map<QString, const ResolvedProduct *> productsByName, - std::unordered_map<QString, const ResolvedProject *> projectsByName, + const std::unordered_map<QString, const ResolvedProduct *> &productsByName, + const std::unordered_map<QString, const ResolvedProject *> &projectsByName, Logger logger) : m_product(std::move(product)) - , m_productsByName(std::move(productsByName)) - , m_projectsByName(std::move(projectsByName)) + // m_productsByName and m_projectsByName are references, cannot move-construct + , m_productsByName(productsByName) + , m_projectsByName(projectsByName) , m_mocScanner(nullptr) , m_logger(std::move(logger)) { diff --git a/src/lib/corelib/buildgraph/rulesapplicator.h b/src/lib/corelib/buildgraph/rulesapplicator.h index 1160f3d09..da7815014 100644 --- a/src/lib/corelib/buildgraph/rulesapplicator.h +++ b/src/lib/corelib/buildgraph/rulesapplicator.h @@ -63,8 +63,8 @@ class RulesApplicator { public: RulesApplicator(ResolvedProductPtr product, - std::unordered_map<QString, const ResolvedProduct *> productsByName, - std::unordered_map<QString, const ResolvedProject *> projectsByName, + const std::unordered_map<QString, const ResolvedProduct *> &productsByName, + const std::unordered_map<QString, const ResolvedProject *> &projectsByName, Logger logger); ~RulesApplicator(); |