diff options
author | Caolán McNamara <caolanm@redhat.com> | 2010-11-29 11:29:09 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-29 11:29:09 +0000 |
commit | a3d9b5d2de18ada0724baac20d0ae3dbbfecaec4 (patch) | |
tree | 163fe8aa07a4cc1660a3ee334284de9ebe62f8ba /salhelper | |
parent | 7d71a684e14218f81f8f84ef93c6041b72324211 (diff) |
get these tests to build again
Diffstat (limited to 'salhelper')
-rw-r--r-- | salhelper/test/rtti/exports.dxp | 2 | ||||
-rw-r--r-- | salhelper/test/rtti/rttitest.cxx | 15 | ||||
-rw-r--r-- | salhelper/test/rtti/samplelibrtti.cxx | 8 | ||||
-rw-r--r-- | salhelper/test/rtti/samplelibrtti.hxx | 5 | ||||
-rw-r--r-- | salhelper/test/rtti/sols.map | 2 |
5 files changed, 2 insertions, 30 deletions
diff --git a/salhelper/test/rtti/exports.dxp b/salhelper/test/rtti/exports.dxp index 41a9804fdbeb..beafa6a1c40f 100644 --- a/salhelper/test/rtti/exports.dxp +++ b/salhelper/test/rtti/exports.dxp @@ -1,8 +1,6 @@ ?funcA@MyClassA@@UAEXXZ ?funcB@MyClassA@@UAEXXZ ?funcC@MyClassA@@MAEXXZ -?funcD@MyClassA@@EAEXXZ ?funcA@MyClassB@@UAEXXZ ?funcB@MyClassB@@UAEXXZ ?funcC@MyClassB@@MAEXXZ -?funcD@MyClassB@@EAEXXZ
\ No newline at end of file diff --git a/salhelper/test/rtti/rttitest.cxx b/salhelper/test/rtti/rttitest.cxx index a39a7e1760f8..c44cb9ead34a 100644 --- a/salhelper/test/rtti/rttitest.cxx +++ b/salhelper/test/rtti/rttitest.cxx @@ -1,31 +1,20 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#include <rtl/ustring> #include <stdio.h> #include <typeinfo> #include "samplelibrtti.hxx" - -//using namespace salhelper; -using namespace rtl; - - - -int main( int argc, char *argv[ ], char *envp[ ] ) +int main( void ) { MyClassB b; MyClassA* pA= &b; // test the virtual function pA->funcA(); -// const type_info& i1= typeid ( b); -// const type_info& i2= typeid( pA); - if( typeid( b) == typeid( pA)) printf("\nsame types"); - MyClassB* pB= dynamic_cast<MyClassB* >( pA); - pB->funcA(); + pB->funcA(); return 0; } diff --git a/salhelper/test/rtti/samplelibrtti.cxx b/salhelper/test/rtti/samplelibrtti.cxx index 26b4a68e1561..e3cec911865e 100644 --- a/salhelper/test/rtti/samplelibrtti.cxx +++ b/salhelper/test/rtti/samplelibrtti.cxx @@ -16,10 +16,6 @@ void MyClassA::funcC() { } -void MyClassA::funcD() -{ -} - // MyClassB =============================================================== void MyClassB::funcA() { @@ -35,8 +31,4 @@ void MyClassB::funcC() { } -void MyClassB::funcD() -{ -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/salhelper/test/rtti/samplelibrtti.hxx b/salhelper/test/rtti/samplelibrtti.hxx index 8e94355a4499..dd6a87052c6d 100644 --- a/salhelper/test/rtti/samplelibrtti.hxx +++ b/salhelper/test/rtti/samplelibrtti.hxx @@ -9,8 +9,6 @@ public: virtual void funcB(); protected: virtual void funcC(); -private: - virtual void funcD(); }; @@ -21,9 +19,6 @@ public: virtual void funcB(); protected: virtual void funcC(); -private: - virtual void funcD(); - }; #endif diff --git a/salhelper/test/rtti/sols.map b/salhelper/test/rtti/sols.map index babf2c901585..aa778d405666 100644 --- a/salhelper/test/rtti/sols.map +++ b/salhelper/test/rtti/sols.map @@ -7,12 +7,10 @@ _init; __1cIMyClassAFfuncA6M_v_; __1cIMyClassAFfuncB6M_v_; __1cIMyClassAFfuncC6M_v_; -__1cIMyClassAFfuncD6M_v_; __1cIMyClassAG__vtbl_; __1cIMyClassBFfuncA6M_v_; __1cIMyClassBFfuncB6M_v_; __1cIMyClassBFfuncC6M_v_; -__1cIMyClassBFfuncD6M_v_; __1cIMyClassBG__vtbl_; __RTTI__1CpknIMyClassA_; __RTTI__1CpknIMyClassB_; |