Piotr Caban : msvcp100: Added _Container_base0::operator= implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: acbfab38dbe10c4c9600878235fe876615bf6533
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=acbfab38dbe10c4c9600878235...

Author: Piotr Caban 
Date:   Mon Nov 26 22:32:28 2012 +0000

msvcp100: Added _Container_base0::operator= implementation.

---

dlls/msvcp100/misc.c        |   30 ++++++++++++++++++++++++++++++
 dlls/msvcp100/msvcp100.c    |   22 ----------------------
 dlls/msvcp100/msvcp100.spec |    4 ++--
 3 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/dlls/msvcp100/misc.c b/dlls/msvcp100/misc.c
index 5854c5e..13183bb 100644
--- a/dlls/msvcp100/misc.c
+++ b/dlls/msvcp100/misc.c
@@ -229,3 +229,33 @@ MSVCP_new_handler_func __cdecl set_new_handler_reset(int unused)
 {
     return set_new_handler(NULL);
 }
+
+/* _Container_base0 is used by apps compiled without iterator checking
+ * (i.e. with _ITERATOR_DEBUG_LEVEL=0 ).
+ * It provides empty versions of methods used by visual c++'s stl's
+ * iterator checking.
+ * msvcr100 has to provide them in case apps are compiled with /Od
+ * or the optimizer fails to inline those (empty) calls.
+ */
+
+/* ?_Orphan_all@_Container_base0@std@@QAEXXZ */
+/* ?_Orphan_all@_Container_base0@std@@QEAAXXZ */
+DEFINE_THISCALL_WRAPPER(Container_base0_Orphan_all, 4)
+void __thiscall Container_base0_Orphan_all(void *this)
+{
+}
+
+/* ?_Swap_all@_Container_base0@std@@QAEXAAU12@@Z */
+/* ?_Swap_all@_Container_base0@std@@QEAAXAEAU12@@Z */
+DEFINE_THISCALL_WRAPPER(Container_base0_Swap_all, 8)
+void __thiscall Container_base0_Swap_all(void *this, void *that)
+{
+}
+
+/* ??4_Container_base0@std@@QAEAAU01@ABU01@@Z */
+/* ??4_Container_base0@std@@QEAAAEAU01@AEBU01@@Z */
+DEFINE_THISCALL_WRAPPER(Container_base0_op_assign, 8)
+void* __thiscall Container_base0_op_assign(void *this, const void *that)
+{
+    return this;
+}
diff --git a/dlls/msvcp100/msvcp100.c b/dlls/msvcp100/msvcp100.c
index 4238a24..c0f1ecd 100644
--- a/dlls/msvcp100/msvcp100.c
+++ b/dlls/msvcp100/msvcp100.c
@@ -80,28 +80,6 @@ static void init_cxx_funcs(void)
     }
 }

-/* _Container_base0 is used by apps compiled without iterator checking
- * (i.e. with _ITERATOR_DEBUG_LEVEL=0 ).
- * It provides empty versions of methods used by visual c++'s stl's
- * iterator checking.
- * msvcr100 has to provide them in case apps are compiled with /Od
- * or the optimizer fails to inline those (empty) calls.
- */
-
-/* ?_Orphan_all@_Container_base0@std@@QAEXXZ */
-/* ?_Orphan_all@_Container_base0@std@@QEAAXXZ */
-DEFINE_THISCALL_WRAPPER(Container_base0_Orphan_all, 4)
-void __thiscall Container_base0_Orphan_all(void *this)
-{
-}
-
-/* ?_Swap_all@_Container_base0@std@@QAEXAAU12@@Z */
-/* ?_Swap_all@_Container_base0@std@@QEAAXAEAU12@@Z */
-DEFINE_THISCALL_WRAPPER(Container_base0_Swap_all, 8)
-void __thiscall Container_base0_Swap_all(void *this, void *that)
-{
-}
-
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec
index 0603fd4..4ed384e 100644
--- a/dlls/msvcp100/msvcp100.spec
+++ b/dlls/msvcp100/msvcp100.spec
@@ -400,8 +400,8 @@
 @ cdecl -arch=win64 ??4?$numeric_limits@_W@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) std_Num_base_op_assign
 @ thiscall -arch=win32 ??4Init@ios_base@std@@QAEAAV012@ABV012@@Z(ptr ptr) ios_base_Init_op_assign
 @ cdecl -arch=win64 ??4Init@ios_base@std@@QEAAAEAV012@AEBV012@@Z(ptr ptr) ios_base_Init_op_assign
-@ stub -arch=win32 ??4_Container_base0@std@@QAEAAU01@ABU01@@Z
-@ stub -arch=win64 ??4_Container_base0@std@@QEAAAEAU01@AEBU01@@Z
+@ thiscall -arch=win32 ??4_Container_base0@std@@QAEAAU01@ABU01@@Z(ptr ptr) Container_base0_op_assign
+@ cdecl -arch=win64 ??4_Container_base0@std@@QEAAAEAU01@AEBU01@@Z(ptr ptr) Container_base0_op_assign
 @ stub -arch=win32 ??4_Container_base12@std@@QAEAAU01@ABU01@@Z
 @ stub -arch=win64 ??4_Container_base12@std@@QEAAAEAU01@AEBU01@@Z
 @ stub -arch=win32 ??4_Init_locks@std@@QAEAAV01@ABV01@@Z