Piotr Caban : msvcp120: Don't add basic_ios:: _Add_vtordisp virtual functions.
Alexandre Julliard
julliard at winehq.org
Sat Oct 1 10:34:44 CDT 2016
Module: wine
Branch: master
Commit: b5933916286899a20d8f6744b03a206dc0bfea2e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5933916286899a20d8f6744b03a206dc0bfea2e
Author: Piotr Caban <piotr at codeweavers.com>
Date: Fri Sep 30 09:14:14 2016 +0200
msvcp120: Don't add basic_ios::_Add_vtordisp virtual functions.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcp90/ios.c | 64 +++++++++++++++++++++++++++---------------------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c
index ddd9580..f673bc1 100644
--- a/dlls/msvcp90/ios.c
+++ b/dlls/msvcp90/ios.c
@@ -759,21 +759,21 @@ void __asm_dummy_vtables(void) {
VTABLE_ADD_FUNC(ios_base_vector_dtor));
__ASM_VTABLE(basic_ios_char,
VTABLE_ADD_FUNC(basic_ios_char_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_ios_wchar,
VTABLE_ADD_FUNC(basic_ios_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_ios_short,
VTABLE_ADD_FUNC(basic_ios_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
@@ -957,189 +957,189 @@ void __asm_dummy_vtables(void) {
VTABLE_ADD_FUNC(basic_streambuf_wchar_imbue));
__ASM_VTABLE(basic_ostream_char,
VTABLE_ADD_FUNC(basic_ostream_char_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_ostream_wchar,
VTABLE_ADD_FUNC(basic_ostream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_ostream_short,
VTABLE_ADD_FUNC(basic_ostream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_istream_char,
VTABLE_ADD_FUNC(basic_istream_char_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_istream_wchar,
VTABLE_ADD_FUNC(basic_istream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_istream_short,
VTABLE_ADD_FUNC(basic_istream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_iostream_char,
VTABLE_ADD_FUNC(basic_iostream_char_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_iostream_wchar,
VTABLE_ADD_FUNC(basic_iostream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_iostream_short,
VTABLE_ADD_FUNC(basic_iostream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_ofstream_char,
VTABLE_ADD_FUNC(basic_ofstream_char_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_ofstream_wchar,
VTABLE_ADD_FUNC(basic_ofstream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_ofstream_short,
VTABLE_ADD_FUNC(basic_ofstream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_ifstream_char,
VTABLE_ADD_FUNC(basic_ifstream_char_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_ifstream_wchar,
VTABLE_ADD_FUNC(basic_ifstream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_ifstream_short,
VTABLE_ADD_FUNC(basic_ifstream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_fstream_char,
VTABLE_ADD_FUNC(basic_fstream_char_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_fstream_wchar,
VTABLE_ADD_FUNC(basic_fstream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_fstream_short,
VTABLE_ADD_FUNC(basic_fstream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_ostringstream_char,
VTABLE_ADD_FUNC(basic_ostringstream_char_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_ostringstream_wchar,
VTABLE_ADD_FUNC(basic_ostringstream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_ostringstream_short,
VTABLE_ADD_FUNC(basic_ostringstream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_istringstream_char,
VTABLE_ADD_FUNC(basic_istringstream_char_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_istringstream_wchar,
VTABLE_ADD_FUNC(basic_istringstream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_istringstream_short,
VTABLE_ADD_FUNC(basic_istringstream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_stringstream_char,
VTABLE_ADD_FUNC(basic_stringstream_char_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_stringstream_wchar,
VTABLE_ADD_FUNC(basic_stringstream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(basic_stringstream_short,
VTABLE_ADD_FUNC(basic_stringstream_wchar_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
@@ -1163,14 +1163,14 @@ void __asm_dummy_vtables(void) {
VTABLE_ADD_FUNC(basic_streambuf_char_imbue));
__ASM_VTABLE(ostrstream,
VTABLE_ADD_FUNC(ostrstream_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
__ASM_VTABLE(strstream,
VTABLE_ADD_FUNC(strstream_vector_dtor)
-#if _MSVCP_VER >= 110
+#if _MSVCP_VER == 110
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
More information about the wine-cvs
mailing list