From 3b2b8f91ff22b93050b9b1aa3da5bd4359182499 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 1 Oct 2008 09:04:58 +0000 Subject: CWS-TOOLING: integrate CWS sb93 --- cppu/qa/makefile.mk | 14 +++++++++++--- cppu/qa/types.idl | 4 +++- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'cppu/qa') diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk index c0a1f1df0542..4051dd6d82ec 100644 --- a/cppu/qa/makefile.mk +++ b/cppu/qa/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.6.14.1 $ # # This file is part of OpenOffice.org. # @@ -62,7 +62,14 @@ SHL3VERSIONMAP = version.map SHL3IMPLIB = i$(SHL3TARGET) DEF3NAME = $(SHL3TARGET) -SLOFILES = $(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS) +SHL4TARGET = $(TARGET)_recursion +SHL4OBJS = $(SLO)$/test_recursion.obj +SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) +SHL4VERSIONMAP = version.map +SHL4IMPLIB = i$(SHL4TARGET) +DEF4NAME = $(SHL4TARGET) + +SLOFILES = $(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS) $(SHL4OBJS) .INCLUDE: target.mk @@ -84,7 +91,8 @@ $(MISC)$/$(TARGET)$/types.urd: types.idl - $(MKDIR) $(MISC)$/$(TARGET) $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< -test .PHONY: $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN) +test .PHONY: $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN) $(SHL4TARGETN) testshl2 $(SHL1TARGETN) testshl2 $(SHL2TARGETN) testshl2 $(SHL3TARGETN) + testshl2 $(SHL4TARGETN) \ No newline at end of file diff --git a/cppu/qa/types.idl b/cppu/qa/types.idl index 8df58e68ad48..1d62b5c33b26 100644 --- a/cppu/qa/types.idl +++ b/cppu/qa/types.idl @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: types.idl,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.14.1 $ * * This file is part of OpenOffice.org. * @@ -45,6 +45,8 @@ struct Struct2b: Struct2a { long member3; }; struct Poly< T > { long member; }; +struct Rec { sequence< Rec > x; }; + exception Exception1: com::sun::star::uno::Exception { long member; }; exception Exception2: com::sun::star::uno::Exception { long member; }; -- cgit