Merge 40136b6 into 6bbeb0e

sakura-editor · Jan 24, 2021 · 8b9e985 · 8b9e985
2 parents 6bbeb0e + 40136b6
commit 8b9e985
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 38 deletions.
diff --git a/sakura_core/mem/CNativeA.cpp b/sakura_core/mem/CNativeA.cpp
@@ -2,21 +2,6 @@
 #include "StdAfx.h"
 #include "CNativeA.h"
 
-CNativeA::CNativeA() noexcept
-	: CNative()
-{
-}
-
-CNativeA::CNativeA(const CNativeA& rhs)
-	: CNative(rhs)
-{
-}
-
-CNativeA::CNativeA(CNativeA&& other) noexcept
-	: CNative(std::forward<CNativeA>(other))
-{
-}
-
 CNativeA::CNativeA( const char* szData, size_t cchData )
 	: CNative()
 {

diff --git a/sakura_core/mem/CNativeA.h b/sakura_core/mem/CNativeA.h
@@ -30,9 +30,9 @@
 
 class CNativeA final : public CNative{
 public:
-	CNativeA() noexcept;
-	CNativeA( const CNativeA& rhs );
-	CNativeA( CNativeA&& other ) noexcept;
+	CNativeA() noexcept = default;
+	CNativeA( const CNativeA& rhs ) = default;
+	CNativeA( CNativeA&& other ) noexcept = default;
 	CNativeA( const char* szData, size_t cchData );
 	CNativeA( const char* szData);
 
@@ -60,7 +60,7 @@ class CNativeA final : public CNative{
 
 	//演算子
 	CNativeA& operator = (const CNativeA& rhs)			{ CNative::operator=(rhs); return *this; }
-	CNativeA& operator = (CNativeA&& rhs) noexcept		{ CNative::operator=(std::forward<CNativeA>(rhs)); return *this; }
+	CNativeA& operator = (CNativeA&& rhs) noexcept		{ CNative::operator=(std::move(rhs)); return *this; }
 	const CNativeA& operator=( char );
 	const CNativeA& operator+=( char );
 };

diff --git a/sakura_core/mem/CNativeW.cpp b/sakura_core/mem/CNativeW.cpp
@@ -7,21 +7,6 @@
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
 //               コンストラクタ・デストラクタ                  //
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
-CNativeW::CNativeW() noexcept
-	: CNative()
-{
-}
-
-CNativeW::CNativeW(const CNativeW& rhs)
-	: CNative(rhs)
-{
-}
-
-CNativeW::CNativeW(CNativeW&& other) noexcept
-	: CNative(std::forward<CNativeW>(other))
-{
-}
-
 //! nDataLenは文字単位。
 CNativeW::CNativeW( const wchar_t* pData, int nDataLen )
 	: CNative()

diff --git a/sakura_core/mem/CNativeW.h b/sakura_core/mem/CNativeW.h
@@ -72,9 +72,9 @@ class CNativeW final : public CNative{
 
 public:
 	//コンストラクタ・デストラクタ
-	CNativeW() noexcept;
-	CNativeW( const CNativeW& rhs );
-	CNativeW( CNativeW&& other ) noexcept;
+	CNativeW() noexcept = default;
+	CNativeW( const CNativeW& rhs ) = default;
+	CNativeW( CNativeW&& other ) noexcept = default;
 	CNativeW( const wchar_t* pData, int nDataLen ); //!< nDataLenは文字単位。
 	CNativeW( const wchar_t* pData);
 
@@ -98,7 +98,7 @@ class CNativeW final : public CNative{
 
 	//演算子
 	CNativeW& operator = (const CNativeW& rhs)			{ CNative::operator=(rhs); return *this; }
-	CNativeW& operator = (CNativeW&& rhs) noexcept		{ CNative::operator=(std::forward<CNativeW>(rhs)); return *this; }
+	CNativeW& operator = (CNativeW&& rhs) noexcept		{ CNative::operator=(std::move(rhs)); return *this; }
 	CNativeW  operator + (const CNativeW& rhs) const	{ return (CNativeW(*this) += rhs); }
 	CNativeW& operator += (const CNativeW& rhs)			{ AppendNativeData(rhs); return *this; }
 	CNativeW& operator += (wchar_t ch)					{ return (*this += CNativeW(&ch, 1)); }