diff options
author | Jörg Budischewski <jbu@openoffice.org> | 2002-04-18 09:09:22 +0000 |
---|---|---|
committer | Jörg Budischewski <jbu@openoffice.org> | 2002-04-18 09:09:22 +0000 |
commit | 23bfd2e2b2468370bcbc29ef8cbe0007a4b398b3 (patch) | |
tree | 2dbdd0cf7b08a397e7d499d1110d6c2f8a733b81 /bridges | |
parent | *** empty log message *** (diff) | |
download | core-23bfd2e2b2468370bcbc29ef8cbe0007a4b398b3.tar.gz core-23bfd2e2b2468370bcbc29ef8cbe0007a4b398b3.zip |
now passes gcc3 compiler
Diffstat (limited to 'bridges')
-rw-r--r-- | bridges/test/testclient.cxx | 9 | ||||
-rw-r--r-- | bridges/test/testcomp.cxx | 16 | ||||
-rw-r--r-- | bridges/test/testcomp.h | 28 | ||||
-rw-r--r-- | bridges/test/testsameprocess.cxx | 9 | ||||
-rw-r--r-- | bridges/test/testserver.cxx | 9 |
5 files changed, 37 insertions, 34 deletions
diff --git a/bridges/test/testclient.cxx b/bridges/test/testclient.cxx index 7b632eae2403..05dbf4659575 100644 --- a/bridges/test/testclient.cxx +++ b/bridges/test/testclient.cxx @@ -2,9 +2,9 @@ * * $RCSfile: testclient.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: jbu $ $Date: 2002-03-21 16:38:41 $ + * last change: $Author: jbu $ $Date: 2002-04-18 10:09:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -162,7 +162,7 @@ void testLatency( const Reference < XConnection > &r , sal_Bool bReply ) printf( "System latency per call : %g\n" , (( fEnd-fStart )/2.) / ((double)(nLoop)) ); } -void main( int argc, char *argv[] ) +int main( int argc, char *argv[] ) { sal_Bool bUseNew = ( 3 == argc ); if( argc < 2 ) @@ -171,7 +171,7 @@ void main( int argc, char *argv[] ) "usage : testclient [-r] connectionstring\n" " -r reverse call me test (server calls client)" ); - return; + return 1; } OUString sConnectionString; @@ -288,5 +288,6 @@ void main( int argc, char *argv[] ) rComp->dispose(); } printf( "Closed\n" ); + return 0; } diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx index 6bafff5584c8..356618242543 100644 --- a/bridges/test/testcomp.cxx +++ b/bridges/test/testcomp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: testcomp.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: dbo $ $Date: 2001-11-26 17:01:44 $ + * last change: $Author: jbu $ $Date: 2002-04-18 10:09:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,7 +125,7 @@ void parseCommandLine( char *argv[] , } } -Any OInstanceProvider::queryInterface( const Type & aType ) +Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType , SAL_STATIC_CAST( XInstanceProvider * , this ) ); @@ -192,9 +192,9 @@ public: } return aRet; } - virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL acquire() throw() { osl_incrementInterlockedCount( &_nRef ); } - virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL release() throw() { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } // XServiceInfo @@ -325,7 +325,7 @@ Sequence< OUString > ServiceImpl::getSupportedServiceNames() * *****************/ -Any OCallMe::queryInterface( const Type & aType ) +Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType, SAL_STATIC_CAST( XCallMe * , this ) ); @@ -421,7 +421,7 @@ void OCallMe::callAgain( const Reference< ::test::XCallMe >& callAgain, * OInterfaceTest * *******************/ -Any OInterfaceTest::queryInterface( const Type & aType ) +Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType, SAL_STATIC_CAST( XInterfaceTest * , this ) ); @@ -473,7 +473,7 @@ void OInterfaceTest::call() } -Any OTestFactory::queryInterface( const Type & aType ) +Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType, SAL_STATIC_CAST( XTestFactory * , this ) ); diff --git a/bridges/test/testcomp.h b/bridges/test/testcomp.h index 268f6ad4f0ac..f525b797dcc2 100644 --- a/bridges/test/testcomp.h +++ b/bridges/test/testcomp.h @@ -2,9 +2,9 @@ * * $RCSfile: testcomp.h,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: dbo $ $Date: 2001-11-26 17:01:44 $ + * last change: $Author: jbu $ $Date: 2002-04-18 10:09:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,9 +87,9 @@ public: public: // XInterface - Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); - void SAL_CALL acquire() { OWeakObject::acquire(); } - void SAL_CALL release() { OWeakObject::release(); } + Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } public: virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); @@ -114,9 +114,9 @@ public: public: // XInterface - Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); - void SAL_CALL acquire() { OWeakObject::acquire(); } - void SAL_CALL release() { OWeakObject::release(); } + Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL acquire()throw() { OWeakObject::acquire(); } + void SAL_CALL release()throw() { OWeakObject::release(); } public: // XCallMe virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) @@ -150,9 +150,9 @@ public: public: // XInterface - Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); - void SAL_CALL acquire() { OWeakObject::acquire(); } - void SAL_CALL release() { OWeakObject::release(); } + Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL acquire()throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } public: virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) throw(::com::sun::star::uno::RuntimeException); @@ -174,9 +174,9 @@ public: ~OInstanceProvider(){ printf( "instance provider dies\n" );} public: // XInterface - Any SAL_CALL queryInterface( const Type & aType); - void SAL_CALL acquire() { OWeakObject::acquire(); } - void SAL_CALL release() { OWeakObject::release(); } + Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL acquire()throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL diff --git a/bridges/test/testsameprocess.cxx b/bridges/test/testsameprocess.cxx index 121c77ea07f3..f4d8db6882d5 100644 --- a/bridges/test/testsameprocess.cxx +++ b/bridges/test/testsameprocess.cxx @@ -2,9 +2,9 @@ * * $RCSfile: testsameprocess.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: jbu $ $Date: 2001-05-29 07:09:02 $ + * last change: $Author: jbu $ $Date: 2002-04-18 10:09:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -154,12 +154,12 @@ void MyThread::run() } -void main( int argc, char *argv[] ) +int main( int argc, char *argv[] ) { if( argc < 2 ) { printf( "usage : testsamprocess host:port\n" ); - exit(1 ); + return 1; } { @@ -246,4 +246,5 @@ void main( int argc, char *argv[] ) rComp = Reference < XComponent > ( rSMgr , UNO_QUERY ); rComp->dispose(); } + return 0; } diff --git a/bridges/test/testserver.cxx b/bridges/test/testserver.cxx index 305c4a3f835c..8ba70e2f0f2e 100644 --- a/bridges/test/testserver.cxx +++ b/bridges/test/testserver.cxx @@ -2,9 +2,9 @@ * * $RCSfile: testserver.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: jbu $ $Date: 2001-05-29 07:09:02 $ + * last change: $Author: jbu $ $Date: 2002-04-18 10:09:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -215,7 +215,7 @@ void MyThread::run() } -void main( int argc, char *argv[] ) +int main( int argc, char *argv[] ) { // testserver(); @@ -223,7 +223,7 @@ void main( int argc, char *argv[] ) { printf( "usage : testserver [-r] connectionstring\n" " -r does a reverse test (server calls client)\n" ); - exit(1 ); + return 1; } OUString sConnectionString; @@ -284,4 +284,5 @@ void main( int argc, char *argv[] ) Reference < XComponent > rComp( rSMgr, UNO_QUERY ); rComp->dispose(); } + return 0; } |