1 files changed, 28 insertions, 33 deletions

diff --git a/sources/shiboken6/tests/libsample/photon.h b/sources/shiboken6/tests/libsample/photon.h
index 2fbf87d25..2debe47d1 100644
--- a/sources/shiboken6/tests/libsample/photon.h
+++ b/sources/shiboken6/tests/libsample/photon.h
@@ -4,9 +4,10 @@
 #ifndef PHOTON_H
 #define PHOTON_H
 
-#include <list>
 #include "libsamplemacros.h"
 
+#include <list>
+
 // This namespace and classes simulate
 // situations found in Qt's phonon module.
 
@@ -22,8 +23,11 @@ enum ClassType {
 class LIBSAMPLE_API Base
 {
 public:
-    explicit Base(int value) : m_value(value) {}
-    virtual ~Base() {}
+    LIBMINIMAL_DEFAULT_COPY_MOVE(Base)
+
+    explicit Base(int value) noexcept : m_value(value) {}
+    virtual ~Base() = default;
+
     inline void setValue(int value) { m_value = value; }
     inline int value() const { return m_value; }
 
@@ -42,12 +46,14 @@ class LIBSAMPLE_API TemplateBase : public Base
 {
 public:
     explicit TemplateBase(int value) : Base(value) {}
-    inline int multiplicator() const { return (int)CLASS_TYPE; }
-    inline int calculate() const { return m_value * ((int)CLASS_TYPE); }
+    inline int multiplicator() const { return int(CLASS_TYPE); }
+    inline int calculate() const { return m_value * (int(CLASS_TYPE)); }
     static inline ClassType classType() { return CLASS_TYPE; }
 
-    inline int sumValueUsingPointer(TemplateBase<CLASS_TYPE>* other) const { return m_value + other->m_value; }
-    inline int sumValueUsingReference(TemplateBase<CLASS_TYPE>& other) const { return m_value + other.m_value; }
+    inline int sumValueUsingPointer(TemplateBase<CLASS_TYPE> *other) const
+    { return m_value + other->m_value; }
+    inline int sumValueUsingReference(TemplateBase<CLASS_TYPE> &other) const
+    { return m_value + other.m_value; }
 
     inline std::list<TemplateBase<CLASS_TYPE> > getListOfThisTemplateBase()
     {
@@ -57,7 +63,8 @@ public:
         return objs;
     }
 
-    static inline TemplateBase<CLASS_TYPE>* passPointerThrough(TemplateBase<CLASS_TYPE>* obj) { return obj; }
+    static inline TemplateBase<CLASS_TYPE> *passPointerThrough(TemplateBase<CLASS_TYPE> *obj)
+    { return obj; }
 
     ClassType type() const override { return CLASS_TYPE; }
     static const ClassType staticType = CLASS_TYPE;
@@ -71,43 +78,31 @@ template class LIBSAMPLE_API TemplateBase<DuplicatorType>;
 using ValueIdentity = TemplateBase<IdentityType>;
 using ValueDuplicator = TemplateBase<DuplicatorType>;
 
-LIBSAMPLE_API int callCalculateForValueDuplicatorPointer(ValueDuplicator* value);
-LIBSAMPLE_API int callCalculateForValueDuplicatorReference(ValueDuplicator& value);
-LIBSAMPLE_API int countValueIdentities(const std::list<ValueIdentity>& values);
-LIBSAMPLE_API int countValueDuplicators(const std::list<TemplateBase<DuplicatorType> >& values);
-
-// This simulates an internal error (SEGV) caused by 'noexcept' in
-// boost::intrusive_ptr before support for 'noexcept' was added. The ENTIRE
-// code below is needed to trigger the exception; it isn't seen with just a
-// 'noexcept' following a declaration.
-//
-// NOTE: For reasons that should be fairly obvious, this test unfortunately can
-//       only be "run" when building in C++11 mode.
-#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900)
-#  define PHOTON_NOEXCEPT noexcept
-#else
-#  define PHOTON_NOEXCEPT
-#endif
+LIBSAMPLE_API int callCalculateForValueDuplicatorPointer(ValueDuplicator *value);
+LIBSAMPLE_API int callCalculateForValueDuplicatorReference(ValueDuplicator &value);
+LIBSAMPLE_API int countValueIdentities(const std::list<ValueIdentity> &values);
+LIBSAMPLE_API int countValueDuplicators(const std::list<TemplateBase<DuplicatorType> > &values);
+
 class Pointer
 {
 public:
-    Pointer() PHOTON_NOEXCEPT : px(nullptr) {}
-    Pointer(int* p) : px(p) {}
+    Pointer() noexcept = default;
+    explicit Pointer(int *p) : px(p) {}
 
-    void reset() PHOTON_NOEXCEPT { Pointer().swap(*this); }
+    void reset() noexcept { Pointer().swap(*this); }
 
-    int* get() const PHOTON_NOEXCEPT { return px; }
-    int& operator*() const { return *px; }
+    int *get() const noexcept { return px; }
+    int &operator*() const { return *px; }
 
-    void swap(Pointer& rhs) PHOTON_NOEXCEPT
+    void swap(Pointer &rhs) noexcept
     {
-        int* tmp = px;
+        int *tmp = px;
         px = rhs.px;
         rhs.px = tmp;
     }
 
 private:
-    int* px;
+    int *px = nullptr;
 };
 
 } // namespace Photon