Do not introduce VTable when using the NonCopyable helper

docs/deprecations.md

@@ -9,14 +9,6 @@ either of these is a breaking change, and thus will not happen until
 at least the next major release.
 
 
-## Deprecations
-
-### SourceLineInfo::empty()
-
-There should be no reason to ever have an empty `SourceLineInfo`, so the
-method will be removed.
-
-
 ## Planned changes
 
 ### `CHECKED_IF` and `CHECKED_ELSE`

include/internal/catch_common.cpp

@@ -37,7 +37,4 @@ namespace Catch {
         return std::string();
     }
 
-    NonCopyable::NonCopyable() = default;
-    NonCopyable::~NonCopyable() = default;
-
-}
+} // end namespace Catch

include/internal/catch_common.h

@@ -38,17 +38,15 @@ namespace Catch {
         NonCopyable( NonCopyable && )                  = delete;
         NonCopyable& operator = ( NonCopyable const& ) = delete;
         NonCopyable& operator = ( NonCopyable && )     = delete;
-
     protected:
-        NonCopyable();
-        virtual ~NonCopyable();
+        NonCopyable() noexcept = default;
     };
 
     struct SourceLineInfo {
 
         SourceLineInfo() = delete;
-        SourceLineInfo( char const* _file, std::size_t _line ) noexcept
-        :   file( _file ),
+        constexpr SourceLineInfo( char const* _file, std::size_t _line ) noexcept:
+            file( _file ),
             line( _line )
         {}
 
@@ -57,7 +55,6 @@ namespace Catch {
         SourceLineInfo( SourceLineInfo&& )              noexcept = default;
         SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default;
 
-        bool empty() const noexcept { return file[0] == '\0'; }
         bool operator == ( SourceLineInfo const& other ) const noexcept;
         bool operator < ( SourceLineInfo const& other ) const noexcept;
 

include/internal/catch_session.h

@@ -20,7 +20,7 @@ namespace Catch {
     public:
 
         Session();
-        ~Session() override;
+        ~Session();
 
         void showHelp() const;
         void libIdentify();
@@ -41,7 +41,7 @@ namespace Catch {
                 returnCode = run();
             return returnCode;
         }
-    
+
         int run();
 
         clara::Parser const& cli() const;

include/internal/catch_test_registry.cpp

@@ -32,6 +32,4 @@ namespace Catch {
             getMutableRegistryHub().registerStartupException();
         }
     }
-
-    AutoReg::~AutoReg() = default;
 }

include/internal/catch_test_registry.h

@@ -44,7 +44,6 @@ struct NameAndTags {
 
 struct AutoReg : NonCopyable {
     AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
-    ~AutoReg();
 };
 
 } // end namespace Catch