diff --git a/include/qutexAcquisitionHistoryTracker.h b/include/qutexAcquisitionHistoryTracker.h index 8c52652..7cee9d0 100644 --- a/include/qutexAcquisitionHistoryTracker.h +++ b/include/qutexAcquisitionHistoryTracker.h @@ -133,7 +133,7 @@ public: * @param dontAcquireLock If true, skips acquiring the internal spinlock * (assumes caller already holds it) */ - [[nodiscard]] std::unique_ptr&& generateGraph( + [[nodiscard]] std::unique_ptr generateGraph( bool dontAcquireLock = false); // Disable copy constructor and assignment operator diff --git a/include/serializedAsynchronousContinuation.h b/include/serializedAsynchronousContinuation.h index 7ceeb80..b877065 100644 --- a/include/serializedAsynchronousContinuation.h +++ b/include/serializedAsynchronousContinuation.h @@ -39,7 +39,7 @@ public: // Return list of all qutexes in predecessors' LockSets; excludes self. [[nodiscard]] - std::unique_ptr>>&& + std::unique_ptr>> getAcquiredQutexHistory() const; public: diff --git a/smocore/qutexAcquisitionHistoryTracker.cpp b/smocore/qutexAcquisitionHistoryTracker.cpp index 89f2990..26e835a 100644 --- a/smocore/qutexAcquisitionHistoryTracker.cpp +++ b/smocore/qutexAcquisitionHistoryTracker.cpp @@ -114,7 +114,7 @@ void DependencyGraph::dfsCycleDetection( } // QutexAcquisitionHistoryTracker implementation -std::unique_ptr&& +std::unique_ptr QutexAcquisitionHistoryTracker::generateGraph(bool dontAcquireLock) { auto graph = std::make_unique(); @@ -169,7 +169,7 @@ QutexAcquisitionHistoryTracker::generateGraph(bool dontAcquireLock) acquisitionHistoryLock.release(); } - return std::move(graph); + return graph; } /** EXPLANATION - GRIDLOCK DETECTION ALGORITHM: diff --git a/smocore/serializedAsynchronousContinuation.cpp b/smocore/serializedAsynchronousContinuation.cpp index 9199895..864a28a 100644 --- a/smocore/serializedAsynchronousContinuation.cpp +++ b/smocore/serializedAsynchronousContinuation.cpp @@ -198,7 +198,7 @@ SerializedAsynchronousContinuation #endif template -std::unique_ptr>>&& +std::unique_ptr>> SerializedAsynchronousContinuation::getAcquiredQutexHistory() const { @@ -229,7 +229,7 @@ const } } - return std::move(heldLocks); + return heldLocks; } // Explicit template instantiations for the types we need