From 2e1e3fcb1294e77830a58a6a15a8e5e636ef7054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Tr=C3=A1vn=C3=AD=C4=8Dek?= <travnja3@fit.cvut.cz>
Date: Sat, 13 Mar 2021 10:47:25 +0100
Subject: [PATCH] clang-tidy: fix const ref vs value+move
---
alib2abstraction/src/abstraction/PackingAbstraction.cpp | 2 +-
alib2abstraction/src/abstraction/Value.cpp | 4 ++--
alib2measure/src/measurements/MeasurementResults.cpp | 2 +-
alib2measure/src/measurements/MeasurementResults.hpp | 2 +-
alib2measure/src/measurements/frames/CounterDataFrame.cpp | 2 +-
alib2measure/src/measurements/frames/CounterDataFrame.hpp | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/alib2abstraction/src/abstraction/PackingAbstraction.cpp b/alib2abstraction/src/abstraction/PackingAbstraction.cpp
index 73a8b41f8a..49bb50aaea 100644
--- a/alib2abstraction/src/abstraction/PackingAbstraction.cpp
+++ b/alib2abstraction/src/abstraction/PackingAbstraction.cpp
@@ -5,7 +5,7 @@ template class abstraction::PackingAbstraction < 3 >;
namespace abstraction {
-PackingAbstractionImpl::LazyValue::LazyValue ( const std::shared_ptr < abstraction::OperationAbstraction > & ref ) : m_lifeReference ( std::move ( ref ) ) {
+PackingAbstractionImpl::LazyValue::LazyValue ( const std::shared_ptr < abstraction::OperationAbstraction > & ref ) : m_lifeReference ( ref ) {
}
std::shared_ptr < abstraction::Value > PackingAbstractionImpl::LazyValue::asValue ( bool, bool ) {
diff --git a/alib2abstraction/src/abstraction/Value.cpp b/alib2abstraction/src/abstraction/Value.cpp
index b63c7ec268..0edf1bedd5 100644
--- a/alib2abstraction/src/abstraction/Value.cpp
+++ b/alib2abstraction/src/abstraction/Value.cpp
@@ -28,8 +28,8 @@ std::shared_ptr < abstraction::Value > ValueReference::asValue ( bool move, bool
return getProxyAbstraction ( )->asValue ( move, isTemporary );
}
-ValueReference::ValueReference ( std::shared_ptr < abstraction::Value > value, abstraction::TypeQualifiers::TypeQualifierSet typeQualifiers, bool isTemporary ) : m_value ( value ), m_typeQualifiers ( typeQualifiers ), m_isTemporary ( isTemporary ) {
- if ( ! abstraction::TypeQualifiers::isRef ( typeQualifiers ) )
+ValueReference::ValueReference ( const std::shared_ptr < abstraction::Value > & value, abstraction::TypeQualifiers::TypeQualifierSet typeQualifiers, bool isTemporary ) : m_value ( value ), m_typeQualifiers ( typeQualifiers ), m_isTemporary ( isTemporary ) {
+ if ( ! abstraction::TypeQualifiers::isRef ( m_typeQualifiers ) )
throw std::domain_error ( "Reference qualifier required" );
if ( TypeQualifiers::isLvalueRef ( m_typeQualifiers ) && m_isTemporary )
throw std::domain_error ( "Lvalue references cannot be temporaries." );
diff --git a/alib2measure/src/measurements/MeasurementResults.cpp b/alib2measure/src/measurements/MeasurementResults.cpp
index 34a4292300..e26a3509a6 100644
--- a/alib2measure/src/measurements/MeasurementResults.cpp
+++ b/alib2measure/src/measurements/MeasurementResults.cpp
@@ -7,7 +7,7 @@ namespace measurements {
MeasurementResults::MeasurementResults ( ) = default;
-MeasurementResults::MeasurementResults ( const measurements::stealth_vector < MeasurementFrame > & resultFrames ) : frames ( resultFrames ) {
+MeasurementResults::MeasurementResults ( measurements::stealth_vector < MeasurementFrame > resultFrames ) : frames ( std::move ( resultFrames ) ) {
}
void MeasurementResults::printAsList ( std::ostream & os ) const {
diff --git a/alib2measure/src/measurements/MeasurementResults.hpp b/alib2measure/src/measurements/MeasurementResults.hpp
index 5235ccb001..f37cb936ff 100644
--- a/alib2measure/src/measurements/MeasurementResults.hpp
+++ b/alib2measure/src/measurements/MeasurementResults.hpp
@@ -22,7 +22,7 @@ struct MeasurementResults {
measurements::stealth_vector < MeasurementFrame > frames;
MeasurementResults ( );
- MeasurementResults ( const measurements::stealth_vector < MeasurementFrame > & );
+ MeasurementResults ( measurements::stealth_vector < MeasurementFrame > );
void printAsList ( std::ostream & ) const;
void printAsTree ( std::ostream & ) const;
diff --git a/alib2measure/src/measurements/frames/CounterDataFrame.cpp b/alib2measure/src/measurements/frames/CounterDataFrame.cpp
index a2c7f2dcb6..decfa3b176 100644
--- a/alib2measure/src/measurements/frames/CounterDataFrame.cpp
+++ b/alib2measure/src/measurements/frames/CounterDataFrame.cpp
@@ -18,7 +18,7 @@ void CounterDataFrame::update ( unsigned, measurements::stealth_vector < Measure
// noop, updates take place during hint resolution
}
-void CounterDataFrame::hint ( unsigned frameIdx, measurements::stealth_vector < MeasurementFrame > & frames, CounterHint hint ) {
+void CounterDataFrame::hint ( unsigned frameIdx, measurements::stealth_vector < MeasurementFrame > & frames, const CounterHint & hint ) {
if ( frames[frameIdx].type == measurements::Type::ROOT ) return;
CounterHint::value_type delta = 0;
diff --git a/alib2measure/src/measurements/frames/CounterDataFrame.hpp b/alib2measure/src/measurements/frames/CounterDataFrame.hpp
index 1766faab54..792620fd94 100644
--- a/alib2measure/src/measurements/frames/CounterDataFrame.hpp
+++ b/alib2measure/src/measurements/frames/CounterDataFrame.hpp
@@ -30,7 +30,7 @@ struct CounterDataFrame {
static void init ( unsigned, measurements::stealth_vector < MeasurementFrame > & );
static void update ( unsigned, measurements::stealth_vector < MeasurementFrame > & );
- static void hint ( unsigned, measurements::stealth_vector < MeasurementFrame > &, CounterHint );
+ static void hint ( unsigned, measurements::stealth_vector < MeasurementFrame > &, const CounterHint & );
static CounterDataFrame aggregate ( const std::vector < MeasurementFrame > & );
};
--
GitLab