Commit Graph

78 Commits

Author SHA1 Message Date
d7e16fdbab Fix compilation errors with dbglevel>1 2011-08-09 10:27:40 +03:00
35e1b53c7e Remove OS/2 support. 2011-04-18 16:59:48 +02:00
4be7cca60b Merge commit 'ooo/DEV300_m103'
Conflicts:
	codemaker/source/bonobowrappermaker/corbaoptions.cxx
	codemaker/source/cppumaker/cppuoptions.cxx
	codemaker/source/cunomaker/cunooptions.cxx
	codemaker/source/idlmaker/idloptions.cxx
	codemaker/source/javamaker/javaoptions.cxx
	cppu/source/typelib/typelib.cxx
	idlc/source/options.cxx
	offapi/com/sun/star/util/PathSubstitution.idl
	offapi/drafts/com/sun/star/form/ListEntryEvent.idl
	offapi/drafts/com/sun/star/form/XBindableValue.idl
	offapi/drafts/com/sun/star/form/XListEntryListener.idl
	offapi/drafts/com/sun/star/form/XListEntrySink.idl
	offapi/drafts/com/sun/star/form/XListEntrySource.idl
	offapi/drafts/com/sun/star/form/XValueBinding.idl
	registry/tools/checksingleton.cxx
	registry/tools/options.hxx
	registry/tools/regcompare.cxx
	registry/tools/regmerge.cxx
	sal/cppunittester/cppunittester.cxx
	sal/osl/unx/socket.c
	sal/osl/w32/diagnose.c
	sal/prj/d.lst
	sal/rtl/source/alloc_fini.cxx
	sal/rtl/source/alloc_global.c
	sal/rtl/source/makefile.mk
2011-03-23 16:59:59 +01:00
5a7f6793ac Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...) 2011-03-19 14:12:37 +01:00
a3a19632f4 Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
	bridges/source/remote/urp/urp_environment.cxx
	bridges/source/remote/urp/urp_propertyobject.cxx
	bridges/source/remote/urp/urp_reader.cxx
	remotebridges/source/factory/bridgefactory.cxx
	stoc/source/corereflection/crefl.cxx
	stoc/source/javavm/javavm.cxx
	stoc/source/simpleregistry/simpleregistry.cxx
2011-03-18 15:58:02 +01:00
6488e5f120 Move OSL_ENSURE(false,...) to OSL_FAIL(...) 2011-03-12 14:19:48 +01:00
d7fc91fcd1 Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (185 commits)
  chart52: cleanup unused legend entry stuff in preparation of issue #i82802#
  masterfix: #i10000# add missing dependency in offapi
  sb138: #i115619# fix for MinGW
  sb138: #i115619#, #i116038# use osl_setThreadName in binaryurp
  sb138: #i115619# osl_setThreadName
  gridsort: i116682: update UnoControlDialog to reflect XDialog
  gridsort: minor changes to the new API: - renamed XMutableGridDataModel::setRowHeading to updateRowHeading for consistency reasons - renamed XSortableGridDataModel to XSortableGridData - actually, this is not a full-fledged model in itself.
  gridsort: grid control related unit tests (first set, more to come)
  sb138: #i116038# fresh implementation of binary URP bridge
  chart52: #28670# make the legend within charts resizeable - part 2
  gridsort: re-did the column resizing - introduced XGridColumn.Flexibility, determining to which degree the column is resized during auto-column-resizing - removed XGridColumn.PreferredWidth - there really is no need for this anymore now - documented the relationship between XGridColumn.Flexibility and XGridColumn.Resizeable - re-implemented TableControl_Impl::impl_ni_updateColumnWidths, with (hopefully) less magic
  sb139: #i116530# improve Java URP bridge error notification by utilizing the java.lang.Throwable cause facility
  gridsort: document the relationship between soorting the data and notifying XGridDataListeners
  gridsort: introduce XGridColumn::DataModelIndex. this allows for column removal/insertion at the GridColumnModel, without the need to touch the GridDataModel
  locales34: #i112431# adapt documentation to reality
  gridsort: introduce XSortableGridDataModel::removeColumnSort
  gridsort: #163172# added UNO API support for sorting grid data. Implementation still unfinished. Things missing in the SortableGridData implementation - add as listener to the delegator, so we're notified of changes - translate and multiplex those changes - do own notifications (XGridDataListener.dataChanged) when the sort order changed - (possibly) update the sort order when the data in the current sort-column changed
  gridsort: made the row title a row heading, being an Any instead of a string
  gridsort: XMutableGridData: renamed updateRow to updateRowData for consistency; introduced updateRowToolTip as shortcut for multiple updateCellToolTip calls
  gridsort: updateCell->updateCellData, setCellToolTip->updateCellToolTip; in both methods, have (Col,Row) params instead of (Row,Col), for consistency reasons
  ...

Conflicts:
	bridges/inc/bridges/remote/bridgeimpl.hxx
	bridges/inc/bridges/remote/connection.h
	bridges/inc/bridges/remote/context.h
	bridges/inc/bridges/remote/helper.hxx
	bridges/inc/bridges/remote/mapping.hxx
	bridges/inc/bridges/remote/proxy.hxx
	bridges/inc/bridges/remote/remote.h
	bridges/inc/bridges/remote/remote.hxx
	bridges/inc/bridges/remote/stub.hxx
	bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
	bridges/source/remote/context/context.cxx
	bridges/source/remote/static/helper.cxx
	bridges/source/remote/static/mapping.cxx
	bridges/source/remote/static/proxy.cxx
	bridges/source/remote/static/remote.cxx
	bridges/source/remote/static/remote_types.cxx
	bridges/source/remote/static/remote_types.hxx
	bridges/source/remote/static/stub.cxx
	bridges/source/remote/urp/urp_bridgeimpl.cxx
	bridges/source/remote/urp/urp_bridgeimpl.hxx
	bridges/source/remote/urp/urp_cache.h
	bridges/source/remote/urp/urp_cache.hxx
	bridges/source/remote/urp/urp_dispatch.cxx
	bridges/source/remote/urp/urp_dispatch.hxx
	bridges/source/remote/urp/urp_environment.cxx
	bridges/source/remote/urp/urp_job.cxx
	bridges/source/remote/urp/urp_job.hxx
	bridges/source/remote/urp/urp_log.cxx
	bridges/source/remote/urp/urp_log.hxx
	bridges/source/remote/urp/urp_marshal.cxx
	bridges/source/remote/urp/urp_marshal.hxx
	bridges/source/remote/urp/urp_marshal_decl.hxx
	bridges/source/remote/urp/urp_property.hxx
	bridges/source/remote/urp/urp_propertyobject.cxx
	bridges/source/remote/urp/urp_propertyobject.hxx
	bridges/source/remote/urp/urp_reader.cxx
	bridges/source/remote/urp/urp_reader.hxx
	bridges/source/remote/urp/urp_replycontainer.hxx
	bridges/source/remote/urp/urp_threadid.cxx
	bridges/source/remote/urp/urp_threadid.hxx
	bridges/source/remote/urp/urp_unmarshal.cxx
	bridges/source/remote/urp/urp_unmarshal.hxx
	bridges/source/remote/urp/urp_writer.cxx
	bridges/source/remote/urp/urp_writer.hxx
	cppu/source/threadpool/threadpool.cxx
	cppu/util/target.pmk
	cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
	cppuhelper/source/interfacecontainer.cxx
	cpputools/source/regcomplazy/regcomplazy.cxx
	jurt/prj/d.lst
	jvmfwk/source/elements.cxx
	offapi/com/sun/star/awt/grid/GridDataEvent.idl
	offapi/com/sun/star/awt/grid/XGridColumn.idl
	offapi/com/sun/star/awt/tab/makefile.mk
	offapi/com/sun/star/chart2/ExplicitIncrementData.idl
	offapi/com/sun/star/chart2/XPlotter.idl
	offapi/com/sun/star/chart2/XUndoHelper.idl
	offapi/com/sun/star/document/MediaDescriptor.idl
	offapi/com/sun/star/document/makefile.mk
	offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
	offapi/com/sun/star/script/ModuleInfo.idl
	offapi/com/sun/star/script/ModuleType.idl
	offapi/com/sun/star/text/TextMarkupType.idl
	offapi/com/sun/star/util/XTextSearch.idl
	offapi/com/sun/star/xml/sax/XFastAttributeList.idl
	pyuno/source/loader/makefile.mk
	remotebridges/source/bridge/bridge_connection.cxx
	remotebridges/source/bridge/bridge_connection.hxx
	remotebridges/source/bridge/bridge_provider.cxx
	remotebridges/source/bridge/remote_bridge.cxx
	remotebridges/source/bridge/remote_bridge.hxx
	remotebridges/source/dynamicloader/dynamicloader.cxx
	remotebridges/source/factory/bridgefactory.cxx
	remotebridges/source/factory/bridgeimpl.cxx
	remotebridges/source/factory/bridgeimpl.hxx
	remotebridges/source/factory/makefile.mk
	sal/cppunittester/cppunittester.cxx
	sal/inc/osl/diagnose.h
	sal/osl/os2/system.h
	sal/osl/unx/diagnose.c
	sal/osl/unx/file_misc.cxx
	sal/osl/unx/process_impl.cxx
	sal/osl/w32/diagnose.c
	sal/osl/w32/process.cxx
	sal/prj/build.lst
	sal/qa/rtl/math/makefile.mk
	sal/qa/rtl/math/rtl_math.cxx
	sal/qa/rtl/math/rtl_old_testint64.cxx
	sal/qa/rtl/math/test_rtl_math.cxx
	sal/systools/win32/kill/kill.cxx
	sal/textenc/tencinfo.c
	sal/util/sal.map
	stoc/source/inspect/introspection.cxx
	stoc/source/security/file_policy.cxx
	stoc/source/simpleregistry/simpleregistry.cxx
2011-03-08 22:29:39 -06:00
933e22880b Remove "using namespace ::rtl" 2011-03-02 21:53:12 +01:00
fb4f853ff6 debuglevels: removed yet another useless (aka: nearly-always-firing) assertion 2011-02-21 12:45:48 +01:00
60e454d12b debuglevels: removed useless assertions
Those assertions were dependent on OSL_DEBUG_LEVEL > 1 (i.e. only existent with "dmake=1"), and then always
fired. Which fulfills the definition of "useless", /me thinks.
2011-02-21 11:15:06 +01:00
4724f82bf2 move module cppu to boost unordered containers 2011-02-03 23:39:38 +01:00
48252aada0 If CPPU_LEAK_STATIC_DATA is defined, don't bother with assertions
Re-introduce the possibility to define CPPU_LEAK_STATIC_DATA. This
time use it to bypass just the assertions that check that the type
description counts really are zero at the end of the
TypeDescriptor_Init_Impl destructor.

Add more informative debugging printout of which counts are non-zero.

Define CPPU_LEAK_STATIC_DATA for x64 Windows for now. But we do get
the same assertions also on x86 Windows if cppu is built with
OSL_DEBUG_LEVEL>1.
2011-01-23 01:05:45 +02:00
1b11499074 Remove redundant comments 2010-12-05 20:28:21 +00:00
751c750a8c cppcheck: use prefix variant 2010-11-26 21:38:32 +00:00
f12505d596 Revert "Add workaround to avoid crash when exiting LibreOffice"
This reverts commit 146e2fbca20f5cba3410d3d042ae6222a565dd7e.

The workaround is has to be present in libreoffice-3-3, but we do not want to
have it in master, so that eventually it is fixed in the end :-)
2010-11-12 16:21:07 +01:00
8e7f25848a Add workaround to avoid crash when exiting LibreOffice
Reintroduce the horrible CPPU_LEAK_STATIC_DATA hack used in OOo 3.2.1,
but only for Windows builds. No idea what causes the crash. See
fdo#31494. Don't know if this hack has some bad consequences then,
i#107490 seems to say so.
2010-11-10 18:40:38 +02:00
c8540f0850 can undo this now with dial-down in solenv
(cherry picked from commit 23b34d1adafa71612f093d6b5aa015f307785a3f)
2010-11-05 16:18:38 +00:00
b7f08e5afe Workaround for the registration breakage on SUSE.
Commit 55c3066e52ad1843549c442e8d74f886507c58f4 seems to break the SUSE boxes,
this is a workaround for that.
2010-11-03 12:19:34 +01:00
61582157aa micro opts 2010-10-24 20:36:55 +01:00
a715e1b3d0 Add vim/emacs modelines to all source files
Fixes #fdo30794
Based on bin/add-modelines script (originally posted in mail
1286706307.1871.1399280959@webmail.messagingengine.com)

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2010-10-14 17:04:31 +02:00
5192050cf4 AIX cppu quirks 2010-10-13 20:31:42 +01:00
521a9f6f76 #i107490# cppu lifecycle cleanup 2010-10-11 12:37:08 +01:00
sb
ce86770502 sb126: #i107490# dead code not removed by previous cleanup 2010-07-12 11:44:25 +02:00
sb
648603aa7c sb126: #i107490# cppu lifecycle cleanup (patch by cmc, plus removal of now obsolete CPPU_LEAK_STATIC_DATA) 2010-07-07 13:03:20 +02:00
7c80db2eb3 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
50f9ae5a90 CWS-TOOLING: integrate CWS sb109
2009-04-21 13:42:45 +0200 sb  r271035 : removed obsolete psprint dependency
2009-04-21 10:33:31 +0200 sb  r271024 : changes to previous -c270971 so that build does not break for USE_SHELL!=bash (but instead resulting bridgetest_xxx scripts are nonfunctional)
2009-04-21 08:56:48 +0200 sb  r271017 : merged in cws/sb107 -c 268250 (avoid warnings about format specifier and argument mismatch (on 64bit debug builds))
2009-04-20 16:42:27 +0200 sb  r270995 : #i98625# add make_xxx functions for C++ representations of UNO polystructs; fixed and adapted tests (patch by thb, slightly adapted)
2009-04-20 14:23:45 +0200 sb  r270981 : #i84751# selective performance improvements (patch by mmeeks, slightly adapted)
2009-04-20 13:39:50 +0200 sb  r270978 : #i99711# removed dead code (patch by cmc, slightly modified)
2009-04-20 11:59:39 +0200 sb  r270972 : #i97975# avoid crashes during shutdown (patch by cmc, slightly modified)
2009-04-20 11:57:52 +0200 sb  r270971 : made tests work again after LD_LIBRARY_PATH clean up
2009-04-20 09:49:32 +0200 sb  r270963 : #i95593# made tests work again after LD_LIBRARY_PATH cleanup
2009-04-17 13:52:33 +0200 sb  r270941 : merged in cws/sb107 -c 270023 (added svn:ignore)
2009-04-15 13:46:24 +0200 sb  r270841 : #i92131# dead code elimination (based on a patch by cmc)
2009-04-15 13:29:27 +0200 sb  r270839 : #i100743# use a FastLess for the Data map (based on a patch my mmeeks)
2009-04-15 13:12:11 +0200 sb  r270837 : #i100583# dead code elimination (patch by cmc)
2009-04-15 13:02:19 +0200 sb  r270835 : avoid bogus Solaris C++ compiler warning when building with debug=x
2009-04-15 11:49:46 +0200 sb  r270828 : adapted to cleared LD_LIBRARY_PATH
2009-04-15 10:49:48 +0200 sb  r270826 : #i101101# for performance reasons, do not put ComponentContext in unsafe appartment
2009-04-15 10:08:20 +0200 sb  r270824 : #i99113# removed duplicated stocservices.uno lib from basis layer
2009-04-28 18:00:14 +00:00
e591a08dc3 CWS-TOOLING: integrate CWS sb103
2009-01-15 15:28:08 +0100 sb  r266375 : #i97629# set UNO_PATH in python start program and use it in bootstrap function in officehelper.py (and do not erroneously encode a vnd.sun.star.pathname URE_BOOTSTRAP value in tools::extendApplicationEnvironment)
2009-01-15 10:40:17 +0100 sb  r266338 : #i97424# explicit shut down of ImplImageTree singleton in DeInitVCL still required
2009-01-14 12:07:15 +0100 sb  r266276 : CWS-TOOLING: rebase CWS sb103 to trunk@265758 (milestone: DEV300:m38)
2009-01-14 08:53:02 +0100 sb  r266266 : #i96284# remove implementation of unused (but expensive) link feature; plus some general cleanup
2009-01-08 14:42:59 +0100 sb  r266010 : #i96683# enable dlclose for GCC 3 (based on a patch by cmc)
2009-01-06 14:18:23 +0100 sb  r265920 : #i97424# spurious unreferenced local variables
2008-12-19 15:33:39 +0100 sb  r265727 : #i57359# no need for a special glibc 2.2.4 based libgcc_s.so.1 for URE any more as the general one used for OOo is guaranteed to be based on at least glibc 2.2.4, anyway
2008-12-19 13:54:37 +0100 sb  r265724 : #i97424# clean up and speed up vcl ImplImageTree
2008-12-18 14:28:10 +0100 sb  r265690 : #i97132# spread usage of the rtl::Static pattern (patch by cmc)
2008-12-15 14:33:00 +0100 sb  r265499 : #i90492# generate UTF-8 encoded output (patch by tora)
2008-12-15 11:45:05 +0100 sb  r265469 : #i95593# -Djava.library.path to find libtest_javauno_any.so
2008-12-15 11:23:14 +0100 sb  r265468 : #i93769# it appears that Java nowadays expects file URIs in UTF-8, so ExternalUriReferenceTranslator.toExternal must not be called
2008-12-10 12:02:50 +0100 sb  r265164 : #i93219# use (corrected) signal handling instead of forking again (to avoid unintended generation of core files)
2009-02-12 09:18:09 +00:00
3b2b8f91ff CWS-TOOLING: integrate CWS sb93 2008-10-01 09:04:58 +00:00
797c325f16 INTEGRATION: CWS m68kport01 (1.34.6); FILE MERGED
2008/06/11 07:59:57 cmc 1.34.6.1: #i90600# m68k aligns to 16bits, not the natural boundary
2008-06-30 14:08:42 +00:00
4ef5fa8dcf INTEGRATION: CWS changefileheader (1.33.74); FILE MERGED
2008/04/01 15:10:34 thb 1.33.74.3: #i85898# Stripping all external header guards
2008/04/01 12:28:03 thb 1.33.74.2: #i85898# Stripping all external header guards
2008/03/31 07:23:21 rt 1.33.74.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:36:06 +00:00
1f8c5ba5e1 INTEGRATION: CWS changefileheader (1.17.74); FILE MERGED
2008/03/31 07:23:21 rt 1.17.74.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:35:48 +00:00
557f1df425 INTEGRATION: CWS changefileheader (1.4.46); FILE MERGED
2008/03/31 07:23:21 rt 1.4.46.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:35:30 +00:00
6c31b57c38 INTEGRATION: CWS ause074 (1.3.92); FILE MERGED
2007/01/30 12:03:55 hjs 1.3.92.1: #i73801# remove remaining usages of sv[pre].mk
2007-02-06 12:24:25 +00:00
115c623254 INTEGRATION: CWS pchfix02 (1.31.10); FILE MERGED
2006/09/01 17:23:02 kaib 1.31.10.1: #i68856# Added header markers and pch files
2006-09-16 23:20:37 +00:00
ff1ba26f22 INTEGRATION: CWS pchfix02 (1.16.10); FILE MERGED
2006/09/01 17:23:02 kaib 1.16.10.1: #i68856# Added header markers and pch files
2006-09-16 23:20:23 +00:00
9131a4bd7e INTEGRATION: CWS sb56 (1.31.4); FILE MERGED
2006/07/07 09:00:04 sb 1.31.4.1: #i67105# Made code compile (warning-free) with debug=x.
2006-08-24 09:37:52 +00:00
15404494a4 INTEGRATION: CWS warnings01 (1.28.18); FILE MERGED
2006/01/25 17:57:02 sb 1.28.18.3: RESYNC: (1.29-1.30); FILE MERGED
2005/09/22 20:44:21 sb 1.28.18.2: RESYNC: (1.28-1.29); FILE MERGED
2005/08/29 14:03:51 sb 1.28.18.1: #i53898# Made code warning-free.
2006-06-19 12:13:24 +00:00
56bf5d2e15 INTEGRATION: CWS warnings01 (1.14.10); FILE MERGED
2005/11/21 08:42:39 sb 1.14.10.3: #i53898# Made code warning-free.
2005/09/22 20:44:11 sb 1.14.10.2: RESYNC: (1.14-1.15); FILE MERGED
2005/08/31 13:43:20 sb 1.14.10.1: #i53898# Made code warning-free.
2006-06-19 12:13:11 +00:00
fae5892484 INTEGRATION: CWS allocacleanup (1.29.10); FILE MERGED
2005/11/06 08:59:10 maho 1.29.10.1: use #include <sal/alloca.h> instead of <alloca.h>
or something like that.

Issue number:  #i53286#
2006-01-16 12:11:26 +00:00
1cd9fc1406 INTEGRATION: CWS ooo19126 (1.28.22); FILE MERGED
2005/09/05 13:54:29 rt 1.28.22.1: #i54170# Change license header: remove SISSL
2005-09-08 07:49:47 +00:00
aff6d17bb8 INTEGRATION: CWS ooo19126 (1.14.14); FILE MERGED
2005/09/05 13:54:29 rt 1.14.14.1: #i54170# Change license header: remove SISSL
2005-09-08 07:49:18 +00:00
ac000626cf INTEGRATION: CWS ooo19126 (1.2.174); FILE MERGED
2005/09/05 13:54:28 rt 1.2.174.1: #i54170# Change license header: remove SISSL
2005-09-08 07:48:55 +00:00
e0adfd4655 INTEGRATION: CWS solarisgcc02 (1.13.24); FILE MERGED
2005/02/15 20:46:46 pjanik 1.13.24.1: #i42549#: Use stdargs.h instead of varargs.h on Solaris with GCC.

Patch contributed by Taniguchi Yasuaki (JCA).
2005-03-03 16:35:40 +00:00
442773f682 INTEGRATION: CWS presentationengine01 (1.21.12); FILE MERGED
2004/10/13 00:00:46 thb 1.21.12.4: RESYNC: (1.25-1.27); FILE MERGED
2004/10/08 19:45:00 thb 1.21.12.3: #i10000# Fixed windows build breakage (debug=t build only)
2004/07/06 19:25:04 thb 1.21.12.2: RESYNC: (1.21-1.25); FILE MERGED
2004/03/02 16:47:13 sb 1.21.12.1: #i26044# Make sure interface type descriptions are as complete as necessary when used.
2004-11-26 19:49:31 +00:00
3b5fa7f367 INTEGRATION: CWS ooo20040704 (1.23.6); FILE MERGED
2004/07/18 02:15:15 svesik 1.23.6.4: RESYNC: (1.24-1.25); FILE MERGED
2004/07/02 07:59:58 cmc 1.23.6.3: #i30891# revert header and namespace change
2004/06/29 15:40:59 svesik 1.23.6.2: RESYNC: (1.23-1.24); FILE MERGED
2004/06/28 12:13:46 cmc 1.23.6.1: #i30801 allow using system stl if possible
2004-09-08 13:30:26 +00:00
7a956ae2fe INTEGRATION: CWS sb21 (1.25.6); FILE MERGED
2004/08/06 09:29:19 sb 1.25.6.1: Fixed typo.
2004-08-20 08:26:27 +00:00
79f7dee67a INTEGRATION: CWS sb20 (1.11.6); FILE MERGED
2004/07/12 10:40:58 sb 1.11.6.2: RESYNC: (1.11-1.12); FILE MERGED
2004/07/02 12:12:16 sb 1.11.6.1: #i29740# Improved constness.
2004-07-23 13:40:07 +00:00
40ae06ca1f INTEGRATION: CWS tune04 (1.22.10); FILE MERGED
2004/06/11 08:25:15 cmc 1.22.10.1: #i29636# turn global objects into local static data protected with swishy double-locked templated template
2004-06-25 16:15:48 +00:00
ac118e0b64 INTEGRATION: CWS ooo64bit01 (1.21.16); FILE MERGED
2004/05/01 22:26:40 svesik 1.21.16.2: RESYNC: (1.21-1.22); FILE MERGED
2004/03/16 23:54:05 fa 1.21.16.1: Merge cws_srx644_port64bit, other misc fixes
2004-06-17 11:46:14 +00:00
b744095bb3 INTEGRATION: CWS ooo64bit01 (1.10.16); FILE MERGED
2004/03/16 23:54:05 fa 1.10.16.1: Merge cws_srx644_port64bit, other misc fixes
2004-06-17 11:45:58 +00:00