aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--paludis/distribution-impl.hh4
-rw-r--r--paludis/environment.hh4
-rw-r--r--paludis/util/active_object_ptr.hh10
-rw-r--r--paludis/util/clone-impl.hh10
-rw-r--r--paludis/util/create_iterator-impl.hh4
-rw-r--r--paludis/util/deferred_construction_ptr.hh7
-rw-r--r--paludis/util/graph-impl.hh30
-rw-r--r--paludis/util/map-impl.hh4
-rw-r--r--paludis/util/member_iterator-impl.hh7
-rw-r--r--paludis/util/named_value.hh11
-rw-r--r--paludis/util/pool-impl.hh4
-rw-r--r--paludis/util/sequence-impl.hh4
-rw-r--r--paludis/util/set-impl.hh4
-rw-r--r--paludis/util/wrapped_value-impl.hh4
14 files changed, 29 insertions, 78 deletions
diff --git a/paludis/distribution-impl.hh b/paludis/distribution-impl.hh
index 7eb835068..4fcb5db00 100644
--- a/paludis/distribution-impl.hh
+++ b/paludis/distribution-impl.hh
@@ -44,9 +44,7 @@ namespace paludis
}
template <typename Data_>
- ExtraDistributionData<Data_>::~ExtraDistributionData()
- {
- }
+ ExtraDistributionData<Data_>::~ExtraDistributionData() = default;
template <typename T_>
struct ExtraDistributionDataData;
diff --git a/paludis/environment.hh b/paludis/environment.hh
index dd92c9709..cb25fc682 100644
--- a/paludis/environment.hh
+++ b/paludis/environment.hh
@@ -134,9 +134,7 @@ namespace paludis
NoSuchPackageError(const std::string & name) noexcept;
- virtual ~NoSuchPackageError()
- {
- }
+ virtual ~NoSuchPackageError() = default;
///\}
diff --git a/paludis/util/active_object_ptr.hh b/paludis/util/active_object_ptr.hh
index 69527ac84..ced3f097a 100644
--- a/paludis/util/active_object_ptr.hh
+++ b/paludis/util/active_object_ptr.hh
@@ -61,15 +61,9 @@ namespace paludis
{
}
- ActiveObjectPtr(const ActiveObjectPtr & other) :
- _ptr(other._ptr),
- _mutex(other._mutex)
- {
- }
+ ActiveObjectPtr(const ActiveObjectPtr & other) = default;
- ~ActiveObjectPtr()
- {
- }
+ ~ActiveObjectPtr() = default;
ActiveObjectPtr &
operator= (const ActiveObjectPtr & other)
diff --git a/paludis/util/clone-impl.hh b/paludis/util/clone-impl.hh
index a877da678..2ec817734 100644
--- a/paludis/util/clone-impl.hh
+++ b/paludis/util/clone-impl.hh
@@ -31,9 +31,7 @@
namespace paludis
{
template <typename T_>
- Cloneable<T_>::~Cloneable()
- {
- }
+ Cloneable<T_>::~Cloneable() = default;
template<typename Base_, typename Child_>
std::shared_ptr<Base_>
@@ -42,10 +40,8 @@ namespace paludis
return std::shared_ptr<Base_>(std::make_shared<Child_>(*static_cast<const Child_ *>(this)));
}
- template<typename Base_, typename Child_>
- CloneUsingThis<Base_, Child_>::~CloneUsingThis()
- {
- }
+ template <typename Base_, typename Child_>
+ CloneUsingThis<Base_, Child_>::~CloneUsingThis() = default;
}
#endif
diff --git a/paludis/util/create_iterator-impl.hh b/paludis/util/create_iterator-impl.hh
index a012f72e3..701cb103d 100644
--- a/paludis/util/create_iterator-impl.hh
+++ b/paludis/util/create_iterator-impl.hh
@@ -31,9 +31,7 @@ namespace paludis
}
template <typename Value_, typename Iter_>
- CreateInsertIterator<Value_, Iter_>::~CreateInsertIterator()
- {
- }
+ CreateInsertIterator<Value_, Iter_>::~CreateInsertIterator() = default;
template <typename Value_, typename Iter_>
CreateInsertIterator<Value_, Iter_>::CreateInsertIterator(const CreateInsertIterator & i) :
diff --git a/paludis/util/deferred_construction_ptr.hh b/paludis/util/deferred_construction_ptr.hh
index 89c73ba49..50cfe69dc 100644
--- a/paludis/util/deferred_construction_ptr.hh
+++ b/paludis/util/deferred_construction_ptr.hh
@@ -41,12 +41,7 @@ namespace paludis
{
}
- DeferredConstructionPtr(const DeferredConstructionPtr & other) :
- _ptr(other._ptr),
- _f(other._f),
- _done(other._done)
- {
- }
+ DeferredConstructionPtr(const DeferredConstructionPtr & other) = default;
DeferredConstructionPtr &
operator= (const DeferredConstructionPtr & other)
diff --git a/paludis/util/graph-impl.hh b/paludis/util/graph-impl.hh
index 78753d12a..be498885f 100644
--- a/paludis/util/graph-impl.hh
+++ b/paludis/util/graph-impl.hh
@@ -99,9 +99,7 @@ namespace paludis
///\name Basic operations
///\{
- Imp()
- {
- }
+ Imp() = default;
Imp(const std::map<Node_, std::map<Node_, Edge_, Comparator_>, Comparator_> s) :
store(s)
@@ -124,9 +122,7 @@ namespace paludis
}
template <typename Node_, typename Edge_, typename Comparator_>
- DirectedGraph<Node_, Edge_, Comparator_>::~DirectedGraph()
- {
- }
+ DirectedGraph<Node_, Edge_, Comparator_>::~DirectedGraph() = default;
template <typename Node_, typename Edge_, typename Comparator_>
void
@@ -174,23 +170,19 @@ namespace paludis
///\name Basic operations
///\{
- NodeConstIterator(const NodeConstIterator & other) :
- _i(other._i)
- {
- }
+ NodeConstIterator(const NodeConstIterator & other) = default;
- ~NodeConstIterator()
- {
- }
+ ~NodeConstIterator() = default;
- ///\}
+ ///\}
- ///\name Comparison operators
- ///\{
+ ///\name Comparison operators
+ ///\{
- bool operator== (const NodeConstIterator & other) const
- {
- return _i == other._i;
+ bool
+ operator==(const NodeConstIterator & other) const
+ {
+ return _i == other._i;
}
bool operator!= (const NodeConstIterator & other) const
diff --git a/paludis/util/map-impl.hh b/paludis/util/map-impl.hh
index 36d38fd47..56dbaa725 100644
--- a/paludis/util/map-impl.hh
+++ b/paludis/util/map-impl.hh
@@ -79,9 +79,7 @@ paludis::Map<K_, V_, C_>::Map() :
}
template <typename K_, typename V_, typename C_>
-paludis::Map<K_, V_, C_>::~Map()
-{
-}
+paludis::Map<K_, V_, C_>::~Map() = default;
template <typename K_, typename V_, typename C_>
typename paludis::Map<K_, V_, C_>::ConstIterator
diff --git a/paludis/util/member_iterator-impl.hh b/paludis/util/member_iterator-impl.hh
index b8bda6f8a..a1bdc79b0 100644
--- a/paludis/util/member_iterator-impl.hh
+++ b/paludis/util/member_iterator-impl.hh
@@ -25,11 +25,8 @@
namespace paludis
{
- template <typename Value_, typename Iterator_,
- Value_ std::remove_reference<typename std::iterator_traits<Iterator_>::value_type>::type::* member_>
- MemberIterator<Value_, Iterator_, member_>::MemberIterator()
- {
- }
+ template <typename Value_, typename Iterator_, Value_ std::remove_reference<typename std::iterator_traits<Iterator_>::value_type>::type::*member_>
+ MemberIterator<Value_, Iterator_, member_>::MemberIterator() = default;
template <typename Value_, typename Iterator_,
Value_ std::remove_reference<typename std::iterator_traits<Iterator_>::value_type>::type::* member_>
diff --git a/paludis/util/named_value.hh b/paludis/util/named_value.hh
index b638b2e87..26490b7f3 100644
--- a/paludis/util/named_value.hh
+++ b/paludis/util/named_value.hh
@@ -80,21 +80,14 @@ namespace paludis
{
}
- NamedValue(const NamedValue & v) :
- _value(v._value)
- {
- }
+ NamedValue(const NamedValue & v) = default;
NamedValue(NamedValue && v) :
_value(std::move(v._value))
{
}
- NamedValue & operator=(const NamedValue & v)
- {
- _value = v._value;
- return *this;
- }
+ NamedValue & operator=(const NamedValue & v) = default;
V_ & operator() ()
{
diff --git a/paludis/util/pool-impl.hh b/paludis/util/pool-impl.hh
index 0f80f1e06..824898f66 100644
--- a/paludis/util/pool-impl.hh
+++ b/paludis/util/pool-impl.hh
@@ -66,9 +66,7 @@ namespace paludis
}
template <typename T_>
- Pool<T_>::~Pool()
- {
- }
+ Pool<T_>::~Pool() = default;
template <typename T_>
struct PreventConversion
diff --git a/paludis/util/sequence-impl.hh b/paludis/util/sequence-impl.hh
index b8b130155..61efccd08 100644
--- a/paludis/util/sequence-impl.hh
+++ b/paludis/util/sequence-impl.hh
@@ -73,9 +73,7 @@ paludis::Sequence<T_>::Sequence() :
}
template <typename T_>
-paludis::Sequence<T_>::~Sequence()
-{
-}
+paludis::Sequence<T_>::~Sequence() = default;
template <typename T_>
typename paludis::Sequence<T_>::ConstIterator
diff --git a/paludis/util/set-impl.hh b/paludis/util/set-impl.hh
index d99e6dc8a..08014855b 100644
--- a/paludis/util/set-impl.hh
+++ b/paludis/util/set-impl.hh
@@ -81,9 +81,7 @@ paludis::Set<T_, C_>::Set() :
}
template <typename T_, typename C_>
-paludis::Set<T_, C_>::~Set()
-{
-}
+paludis::Set<T_, C_>::~Set() = default;
template <typename T_, typename C_>
typename paludis::Set<T_, C_>::ConstIterator
diff --git a/paludis/util/wrapped_value-impl.hh b/paludis/util/wrapped_value-impl.hh
index a1f137c90..3d5a83007 100644
--- a/paludis/util/wrapped_value-impl.hh
+++ b/paludis/util/wrapped_value-impl.hh
@@ -82,9 +82,7 @@ namespace paludis
}
template <typename Tag_>
- WrappedValue<Tag_>::~WrappedValue()
- {
- }
+ WrappedValue<Tag_>::~WrappedValue() = default;
template <typename Tag_>
const typename WrappedValueTraits<Tag_>::UnderlyingType &