[Libreoffice-commits] .: 7 commits - basic/source odk/settings readlicense_oo/docs salhelper/test solenv/inc svl/inc
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Tue Feb 14 08:48:27 PST 2012
basic/source/sbx/sbxvalue.cxx | 23 -----------------------
odk/settings/settings.mk | 10 ----------
readlicense_oo/docs/readme.dtd | 3 +--
salhelper/test/rtti/makefile.mk | 6 ------
solenv/inc/doxygen.cfg | 2 --
solenv/inc/tg_compv.mk | 5 -----
svl/inc/svl/svarray.hxx | 7 -------
7 files changed, 1 insertion(+), 55 deletions(-)
New commits:
commit 9b3372d8f0d59c8bf6789974d04733dff30bd131
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 14 14:37:25 2012 +0100
Remove some more outdated sunpro traces
On Solaris gcc should be used. See:
514cefbcb7b800f8ddd2aa595502f4fe8403882f
19480ddf483174e956bd658b76380dbe499678dd
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index 6907497..d500ca6 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -738,12 +738,6 @@ SV_IMPL_VARARR(nm##_SAR, AE)\
_SV_IMPL_SORTAR_ALG( nm,AE )\
_SV_SEEK_OBJECT( nm,AE )
-#if defined(C40) || defined(C41) || defined(C42) || defined(C50)
-#define C40_INSERT( c, p, n) Insert( (c const *) p, n )
-#define C40_PTR_INSERT( c, p) Insert( (c const *) p )
-#define C40_REPLACE( c, p, n) Replace( (c const *) p, n )
-#define C40_GETPOS( c, r) GetPos( (c const *)r )
-#else
#if defined(ICC) || defined(GCC) || (defined(WNT) && _MSC_VER >= 1400)
#define C40_INSERT( c, p, n ) Insert( (c const *&) p, n )
#define C40_PTR_INSERT( c, p ) Insert( (c const *&) p )
@@ -755,7 +749,6 @@ _SV_SEEK_OBJECT( nm,AE )
#define C40_REPLACE( c, p, n ) Replace( p, n )
#define C40_GETPOS( c, r) GetPos( r )
#endif
-#endif
#endif //_SVARRAY_HXX
commit 5cf9115058beab8e1179d55f0edca5d32e6aaa31
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 14 14:32:28 2012 +0100
move CVER traces (sunpro compiler)
diff --git a/readlicense_oo/docs/readme.dtd b/readlicense_oo/docs/readme.dtd
index f893d54..d404451 100755
--- a/readlicense_oo/docs/readme.dtd
+++ b/readlicense_oo/docs/readme.dtd
@@ -14,7 +14,7 @@
gui (all | UNX | WNT) "all"
os (none | all | SOLARIS | LINUX | WNT | MACOSX) "all"
cpuname (all | SPARC | INTEL | POWERPC) "all"
- com (all | C50 | C52 | GCC | MSC) "all"
+ com (all | GCC | MSC) "all"
localized (true | false) "true"
style (P | H1 | H2 | H3 | HR) "P"
>
@@ -30,4 +30,4 @@
<!ELEMENT List (Text | Paragraph)+>
<!ATTLIST List
Enum (true | false) "false"
->
\ No newline at end of file
+>
commit 72e04abea5b881f29c63bc4beaf48bddabe39a15
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 14 14:30:43 2012 +0100
remove sunpro 5.0 handling
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index f4aab28..be36119 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -205,32 +205,9 @@ SbxValue& SbxValue::operator=( const SbxValue& r )
SbxValue::~SbxValue()
{
-#ifndef C50
Broadcast( SBX_HINT_DYING );
SetFlag( SBX_WRITE );
SbxValue::Clear();
-#else
- // Provisional fix for the Solaris 5.0 compiler bbug
- // at using virtual inheritance. Avoid virtual calls
- // in the destructor. Instead of calling clear()
- // de-allocate posible object references direct.
- if( aData.eType == SbxOBJECT )
- {
- if( aData.pObj && aData.pObj != this )
- {
- HACK(nicht bei Parent-Prop - sonst CyclicRef)
- SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
- sal_Bool bParentProp = pThisVar && 5345 ==
- ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) );
- if ( !bParentProp )
- aData.pObj->ReleaseRef();
- }
- }
- else if( aData.eType == SbxDECIMAL )
- {
- releaseDecimalPtr( aData.pDecimal );
- }
-#endif
}
void SbxValue::Clear()
commit 104613ffb7e94a421994977ebcb85d142ad64a9f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 14 14:28:35 2012 +0100
Remove CVER traces
see 08d49db2aac06ddc9d8c8ad7f34bee3a899e2fa9
diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg
index 7aa1548..b1a443a 100644
--- a/solenv/inc/doxygen.cfg
+++ b/solenv/inc/doxygen.cfg
@@ -1059,10 +1059,8 @@ PREDEFINED = LINUX \
UNX \
VCL \
GCC \
- C341 \
X86_64 \
_DEBUG_RUNTIME \
- VER=C341 \
NPTL \
GLIBC=2 \
NEW_SOLAR \
commit 61ebddf9f41073b2b9b41dae0862d40d0018a6bf
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 14 14:20:31 2012 +0100
salhelper: remove unexisting maps
diff --git a/salhelper/test/rtti/makefile.mk b/salhelper/test/rtti/makefile.mk
index b835780..e87182c 100644
--- a/salhelper/test/rtti/makefile.mk
+++ b/salhelper/test/rtti/makefile.mk
@@ -73,10 +73,6 @@ DEF1NAME= $(SHL1TARGET)
.IF "$(OS)$(CPU)"=="SOLARISS"
SHL1VERSIONMAP= sols.map
-.ELIF "$(OS)$(CPU)"=="LINUXI"
-SHL1VERSIONMAP= lngi.map
-.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-SHL1VERSIONMAP= gcc3_freebsd_intel.map
.ENDIF
commit d45fb87cdd296dee7240adba64b52974f0e87ddc
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 14 14:19:30 2012 +0100
remove gcc2 traces
diff --git a/salhelper/test/rtti/makefile.mk b/salhelper/test/rtti/makefile.mk
index 704454f..b835780 100644
--- a/salhelper/test/rtti/makefile.mk
+++ b/salhelper/test/rtti/makefile.mk
@@ -75,8 +75,6 @@ DEF1NAME= $(SHL1TARGET)
SHL1VERSIONMAP= sols.map
.ELIF "$(OS)$(CPU)"=="LINUXI"
SHL1VERSIONMAP= lngi.map
-.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc2"
-SHL1VERSIONMAP= gcc2_freebsd_intel.map
.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
SHL1VERSIONMAP= gcc3_freebsd_intel.map
.ENDIF
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index 2eb256d..8036d0a 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -75,11 +75,6 @@ COMNAME=mscx
SHORTSTDCPP3:=
SHORTSTDC3:="1"
-.IF "$(CCNUMVER)">="000200910000"
-COMID=GCC
-COMNAME=gcc2
-.ENDIF
-
.IF "$(CCNUMVER)">="000300000001"
COMID=gcc3
commit 3d73801755d2a69dd0a76123e11674769813b8ab
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 14 14:10:38 2012 +0100
odk: remove some dead makefile code
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 949ece7..797d123 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -207,7 +207,6 @@ LIBRARY_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp '-R$$ORIGIN' -z text -nor
ifeq ($(OO_SDK_CC_55_OR_HIGHER),)
LIBRARY_LINK_FLAGS+=-instances=static
endif
-#COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -M $(PRJ)/settings/component.uno.map
COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
EXE_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -Bdirect -z defs
@@ -330,10 +329,6 @@ CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
CC_DEFINES_JNI=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE
-# define for used compiler necessary for UNO
-#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
-#-DCPPU_ENV=gcc3 -- gcc3 3.0
-
CC_OUTPUT_SWITCH=-o
LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
@@ -341,7 +336,6 @@ LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
ifeq "$(PROCTYPE)" "ppc"
LIBRARY_LINK_FLAGS+=-fPIC
endif
-#COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map
COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive
@@ -459,16 +453,13 @@ CC_DEFINES=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_
CC_OUTPUT_SWITCH=-o
LIBRARY_LINK_FLAGS=-dynamiclib -single_module -Wl,-multiply_defined,suppress $(GCC_ARCH_OPTION)
-#-fPIC -fno-common
# install_name '@executable_path$/(@:f)'
-#COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,-exported_symbols_list $(COMP_MAPFILE)
COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
EXE_LINK_FLAGS=$(GCC_ARCH_OPTION) -Wl,-multiply_defined,suppress
LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)"
LINK_JAVA_LIBS=-framework JavaVM
-#LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/Libraries"
ifneq "$(OO_SDK_URE_HOME)" ""
URE_MISC=$(OO_SDK_URE_HOME)/share/misc
@@ -576,7 +567,6 @@ CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK
CC_OUTPUT_SWITCH=-o
LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
-#COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map
COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined
More information about the Libreoffice-commits
mailing list