Tera TermRevision: 7353
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7353
Author: zmatsuo
Date: 2018-12-23 02:31:59 +0900 (Sun, 23 Dec 2018)
Log Message:
-----------
実装抜け
Modified Paths:
--------------
branches/cmake/teraterm/common/codeconv.cpp
-------------- next part --------------
Modified: branches/cmake/teraterm/common/codeconv.cpp
===================================================================
--- branches/cmake/teraterm/common/codeconv.cpp 2018-12-22 17:31:47 UTC (rev 7352)
+++ branches/cmake/teraterm/common/codeconv.cpp 2018-12-22 17:31:59 UTC (rev 7353)
@@ -345,13 +345,10 @@
assign(strW);
}
-#if 0
-tc::tc(const wchar_t *strW, int code_page)
+tc::tc(const tc &obj)
{
- tstr_ = NULL;
- assign(strW, code_page);
+ copy(obj);
}
-#endif
#if defined(MOVE_CONSTRUCTOR_ENABLE)
tc::tc(tc &&obj) noexcept
@@ -380,6 +377,20 @@
return *this;
}
+tc &tc::operator=(const tc &obj)
+{
+ copy(obj);
+ return *this;
+}
+
+#if defined(MOVE_CONSTRUCTOR_ENABLE)
+tc& tc::operator=(tc &&obj) noexcept
+{
+ move(obj);
+ return *this;
+}
+#endif
+
tc tc::fromUtf8(const char *strU8)
{
const wchar_t *strW = _MultiByteToWideChar(strU8, 0, CP_UTF8, NULL);