INTEGRATION: CWS sb21 (1.5.10); FILE MERGED
2004/08/06 14:05:39 sb 1.5.10.1: #i32151# Added check on bad enum (first member != 0); adapted test to no longer use forbidden unsigned hyper as type argument.
This commit is contained in:
parent
42f927515e
commit
51abd6ec27
1 changed files with 10 additions and 5 deletions
|
@ -1,7 +1,7 @@
|
|||
/**************************************************************************
|
||||
#*
|
||||
#* last change $Author: obo $ $Date: 2004-06-03 15:00:42 $
|
||||
#* $Revision: 1.5 $
|
||||
#* last change $Author: rt $ $Date: 2004-08-20 09:15:56 $
|
||||
#* $Revision: 1.6 $
|
||||
#*
|
||||
#* $Logfile: $
|
||||
#*
|
||||
|
@ -274,9 +274,8 @@ public:
|
|||
TestPolyStruct< sal_Bool > const & arg) throw (RuntimeException)
|
||||
{ return arg; }
|
||||
|
||||
virtual void SAL_CALL transportPolyUnsignedHyper(
|
||||
TestPolyStruct< sal_uInt64 > & arg) throw (RuntimeException)
|
||||
{}
|
||||
virtual void SAL_CALL transportPolyHyper(TestPolyStruct< sal_Int64 > & arg)
|
||||
throw (RuntimeException) {}
|
||||
|
||||
virtual void SAL_CALL transportPolySequence(
|
||||
TestPolyStruct< Sequence< Any > > const & arg1,
|
||||
|
@ -309,6 +308,12 @@ public:
|
|||
test::testtools::bridgetest::TestEnum_TEST);
|
||||
/* work around MS compiler bug */ }
|
||||
|
||||
virtual TestPolyStruct< TestBadEnum > SAL_CALL getNullPolyBadEnum()
|
||||
throw (RuntimeException)
|
||||
{ return TestPolyStruct< TestBadEnum >(
|
||||
test::testtools::bridgetest::TestBadEnum_M);
|
||||
/* explicitly instantiate with default enumerator */ }
|
||||
|
||||
virtual TestPolyStruct< TestStruct > SAL_CALL getNullPolyStruct()
|
||||
throw (RuntimeException)
|
||||
{ return TestPolyStruct< TestStruct >(); }
|
||||
|
|
Loading…
Reference in a new issue