[OMPT-svn-commit] OpenMPT r20362 - trunk/OpenMPT/libopenmpt/xmp-openmpt

[<sv...@op...>]

Author: manx
Date: Fri Mar 15 15:47:00 2024
New Revision: 20362
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20362

Log:
[Ref] xmp-openmpt: Tiny cleanups.

Modified:
   trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp

Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp
==============================================================================
--- trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp	Fri Mar 15 14:49:01 2024	(r20361)
+++ trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp	Fri Mar 15 15:47:00 2024	(r20362)
@@ -135,10 +135,7 @@
 	{
 		return;
 	}
-	virtual ~xmp_openmpt_settings()
-	{
-		return;
-	}
+	virtual ~xmp_openmpt_settings() = default;
 };
 
 struct self_xmplay_t {
@@ -167,9 +164,6 @@
 			mod = 0;
 		}
 	}
-	~self_xmplay_t() {
-		return;
-	}
 };
 
 static std::string convert_to_native( const std::string & str ) {
@@ -517,8 +511,8 @@
 	explicit xmplay_streambuf( XMPFILE & file );
 private:
 	int_type underflow() override;
-	xmplay_streambuf( const xmplay_streambuf & );
-	xmplay_streambuf & operator = ( const xmplay_streambuf & );
+	xmplay_streambuf( const xmplay_streambuf & ) = delete;
+	xmplay_streambuf & operator = ( const xmplay_streambuf & ) = delete;
 private:
 	XMPFILE & file;
 	static inline constexpr std::size_t put_back = 4096;
@@ -554,15 +548,12 @@
 private:
 	xmplay_streambuf buf;
 private:
-	xmplay_istream( const xmplay_istream & );
-	xmplay_istream & operator = ( const xmplay_istream & );
+	xmplay_istream( const xmplay_istream & ) = delete;
+	xmplay_istream & operator = ( const xmplay_istream & ) = delete;
 public:
 	xmplay_istream( XMPFILE & file ) : std::istream(&buf), buf(file) {
 		return;
 	}
-	~xmplay_istream() {
-		return;
-	}
 }; // class xmplay_istream
 
 // Stream for memory-based files (required for could_open_probability)