Skip to content

W
wine-winehq
Commit b5933916 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcp120: Don't add basic_ios::_Add_vtordisp virtual functions.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 2035a8c7
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
dlls/msvcp90/ios.c
View file @ b5933916
...@@ -759,21 +759,21 @@ void __asm_dummy_vtables(void) { ...@@ -759,21 +759,21 @@ void __asm_dummy_vtables(void) {
VTABLE_ADD_FUNC(ios_base_vector_dtor)); VTABLE_ADD_FUNC(ios_base_vector_dtor));
__ASM_VTABLE(basic_ios_char, __ASM_VTABLE(basic_ios_char,
VTABLE_ADD_FUNC(basic_ios_char_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_ios_wchar, __ASM_VTABLE(basic_ios_wchar,
VTABLE_ADD_FUNC(basic_ios_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_ios_short, __ASM_VTABLE(basic_ios_short,
VTABLE_ADD_FUNC(basic_ios_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
...@@ -957,189 +957,189 @@ void __asm_dummy_vtables(void) { ...@@ -957,189 +957,189 @@ void __asm_dummy_vtables(void) {
VTABLE_ADD_FUNC(basic_streambuf_wchar_imbue)); VTABLE_ADD_FUNC(basic_streambuf_wchar_imbue));
__ASM_VTABLE(basic_ostream_char, __ASM_VTABLE(basic_ostream_char,
VTABLE_ADD_FUNC(basic_ostream_char_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_ostream_wchar, __ASM_VTABLE(basic_ostream_wchar,
VTABLE_ADD_FUNC(basic_ostream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_ostream_short, __ASM_VTABLE(basic_ostream_short,
VTABLE_ADD_FUNC(basic_ostream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_istream_char, __ASM_VTABLE(basic_istream_char,
VTABLE_ADD_FUNC(basic_istream_char_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_istream_wchar, __ASM_VTABLE(basic_istream_wchar,
VTABLE_ADD_FUNC(basic_istream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_istream_short, __ASM_VTABLE(basic_istream_short,
VTABLE_ADD_FUNC(basic_istream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_iostream_char, __ASM_VTABLE(basic_iostream_char,
VTABLE_ADD_FUNC(basic_iostream_char_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_iostream_wchar, __ASM_VTABLE(basic_iostream_wchar,
VTABLE_ADD_FUNC(basic_iostream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_iostream_short, __ASM_VTABLE(basic_iostream_short,
VTABLE_ADD_FUNC(basic_iostream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_ofstream_char, __ASM_VTABLE(basic_ofstream_char,
VTABLE_ADD_FUNC(basic_ofstream_char_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_ofstream_wchar, __ASM_VTABLE(basic_ofstream_wchar,
VTABLE_ADD_FUNC(basic_ofstream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_ofstream_short, __ASM_VTABLE(basic_ofstream_short,
VTABLE_ADD_FUNC(basic_ofstream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_ifstream_char, __ASM_VTABLE(basic_ifstream_char,
VTABLE_ADD_FUNC(basic_ifstream_char_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_ifstream_wchar, __ASM_VTABLE(basic_ifstream_wchar,
VTABLE_ADD_FUNC(basic_ifstream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_ifstream_short, __ASM_VTABLE(basic_ifstream_short,
VTABLE_ADD_FUNC(basic_ifstream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_fstream_char, __ASM_VTABLE(basic_fstream_char,
VTABLE_ADD_FUNC(basic_fstream_char_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_fstream_wchar, __ASM_VTABLE(basic_fstream_wchar,
VTABLE_ADD_FUNC(basic_fstream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_fstream_short, __ASM_VTABLE(basic_fstream_short,
VTABLE_ADD_FUNC(basic_fstream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_ostringstream_char, __ASM_VTABLE(basic_ostringstream_char,
VTABLE_ADD_FUNC(basic_ostringstream_char_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_ostringstream_wchar, __ASM_VTABLE(basic_ostringstream_wchar,
VTABLE_ADD_FUNC(basic_ostringstream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_ostringstream_short, __ASM_VTABLE(basic_ostringstream_short,
VTABLE_ADD_FUNC(basic_ostringstream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_istringstream_char, __ASM_VTABLE(basic_istringstream_char,
VTABLE_ADD_FUNC(basic_istringstream_char_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_istringstream_wchar, __ASM_VTABLE(basic_istringstream_wchar,
VTABLE_ADD_FUNC(basic_istringstream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_istringstream_short, __ASM_VTABLE(basic_istringstream_short,
VTABLE_ADD_FUNC(basic_istringstream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_stringstream_char, __ASM_VTABLE(basic_stringstream_char,
VTABLE_ADD_FUNC(basic_stringstream_char_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_stringstream_wchar, __ASM_VTABLE(basic_stringstream_wchar,
VTABLE_ADD_FUNC(basic_stringstream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(basic_stringstream_short, __ASM_VTABLE(basic_stringstream_short,
VTABLE_ADD_FUNC(basic_stringstream_wchar_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
...@@ -1163,14 +1163,14 @@ void __asm_dummy_vtables(void) { ...@@ -1163,14 +1163,14 @@ void __asm_dummy_vtables(void) {
VTABLE_ADD_FUNC(basic_streambuf_char_imbue)); VTABLE_ADD_FUNC(basic_streambuf_char_imbue));
__ASM_VTABLE(ostrstream, __ASM_VTABLE(ostrstream,
VTABLE_ADD_FUNC(ostrstream_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
); );
__ASM_VTABLE(strstream, __ASM_VTABLE(strstream,
VTABLE_ADD_FUNC(strstream_vector_dtor) 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_vtordisp1)
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment