You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/11/18 17:26:20 UTC
svn commit: r1543067 [1/2] - in /openoffice/trunk/main: ./
autodoc/source/exes/adc_uni/ basebmp/test/ basegfx/source/workbench/
basegfx/test/ configmgr/source/ connectivity/source/commontools/
cosv/source/unittest/ cpputools/source/unoexe/ desktop/sour...
Author: hdu
Date: Mon Nov 18 16:26:19 2013
New Revision: 1543067
URL: http://svn.apache.org/r1543067
Log:
#i122362# remove stlport4-build support
but keep the --without-stlport configure option for now
it is the new default anyway
Removed:
openoffice/trunk/main/stlport/STLport-4.0-sunstudio12u1.patch
openoffice/trunk/main/stlport/STLport-4.0.patch
openoffice/trunk/main/stlport/STLport-4.5-0119.patch
openoffice/trunk/main/stlport/STLport-4.5-gcc43_warnings.patch
openoffice/trunk/main/stlport/STLport-4.5.patch
openoffice/trunk/main/stlport/dos_lineends.patch
openoffice/trunk/main/stlport/systemstlguards/postextstl.h
openoffice/trunk/main/stlport/systemstlguards/preextstl.h
openoffice/trunk/main/stlport/win32_custom.sh
openoffice/trunk/main/stlport/win32_sdk.sh
Modified:
openoffice/trunk/main/LICENSE
openoffice/trunk/main/RepositoryFixes.mk
openoffice/trunk/main/autodoc/source/exes/adc_uni/makefile.mk
openoffice/trunk/main/basebmp/test/makefile.mk
openoffice/trunk/main/basegfx/source/workbench/Makefile
openoffice/trunk/main/basegfx/test/makefile.mk
openoffice/trunk/main/configmgr/source/partial.hxx
openoffice/trunk/main/configure.in
openoffice/trunk/main/connectivity/source/commontools/dbtools.cxx
openoffice/trunk/main/cosv/source/unittest/makefile.mk
openoffice/trunk/main/cpputools/source/unoexe/makefile.mk
openoffice/trunk/main/desktop/source/pagein/makefile.mk
openoffice/trunk/main/editeng/source/uno/unoipset.cxx
openoffice/trunk/main/external_deps.lst
openoffice/trunk/main/nss/nss.patch
openoffice/trunk/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
openoffice/trunk/main/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
openoffice/trunk/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
openoffice/trunk/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile
openoffice/trunk/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
openoffice/trunk/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
openoffice/trunk/main/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile
openoffice/trunk/main/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile
openoffice/trunk/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile
openoffice/trunk/main/odk/pack/copying/makefile.mk
openoffice/trunk/main/odk/util/odk_rules.pmk
openoffice/trunk/main/postprocess/rebase/coffbase.txt
openoffice/trunk/main/sal/cppunittester/makefile.mk
openoffice/trunk/main/sal/inc/rtl/string.hxx
openoffice/trunk/main/sal/rtl/source/bootstrap.cxx
openoffice/trunk/main/sal/util/makefile.mk
openoffice/trunk/main/sax/qa/cppunit/makefile.mk
openoffice/trunk/main/scp2/inc/macros.inc
openoffice/trunk/main/scp2/source/ooo/makefile.mk
openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
openoffice/trunk/main/scp2/source/ooo/ure.scp
openoffice/trunk/main/scp2/source/winexplorerext/makefile.mk
openoffice/trunk/main/set_soenv.in
openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/patch/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/quickstarter/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/rebase/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/reg64/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/regactivex/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/tools/makefile.mk
openoffice/trunk/main/slideshow/source/engine/animationfactory.cxx
openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
openoffice/trunk/main/solenv/gbuild/gbuild.mk
openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
openoffice/trunk/main/solenv/inc/unxlng.mk
openoffice/trunk/main/solenv/inc/unxmacx.mk
openoffice/trunk/main/solenv/inc/wntmsci11.mk
openoffice/trunk/main/stlport/makefile.mk
openoffice/trunk/main/stlport/prj/d.lst
openoffice/trunk/main/tools/Executable_mkunroll.mk
openoffice/trunk/main/tools/Executable_rscdep.mk
openoffice/trunk/main/tools/Executable_so_checksum.mk
openoffice/trunk/main/tools/Executable_sspretty.mk
openoffice/trunk/main/ure/source/uretest/Makefile
openoffice/trunk/main/ure/source/uretest/Makefile.pln
openoffice/trunk/main/vcl/Library_vcl.mk
Modified: openoffice/trunk/main/LICENSE
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/LICENSE?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/LICENSE (original)
+++ openoffice/trunk/main/LICENSE Mon Nov 18 16:26:19 2013
@@ -1835,72 +1835,6 @@ OF OR IN CONNECTION WITH THE USE OR PERF
____
-For STLport - build in main/stlport/:
-
-Boris Fomitchev grants Licensee a non-exclusive, non-transferable,
-royalty-free license to use STLport and its documentation without fee.
-
-By downloading, using, or copying STLport or any portion thereof,
-Licensee agrees to abide by the intellectual property laws and all other
-applicable laws of the United States of America, and to all of the terms
-and conditions of this Agreement.
-
-Licensee shall maintain the following copyright and permission notices on
-STLport sources and its documentation unchanged:
-
-Copyright 1999, 2000 Boris Fomitchev
-
-This material is provided "as is", with absolutely no warranty expressed
-or implied. Any use is at your own risk. Permission to use or copy this
-software for any purpose is hereby granted without fee, provided the
-above notices are retained on all copies. Permission to modify the code
-and to distribute modified code is granted, provided the above notices
-are retained, and a notice that the code was modified is included with
-the above copyright notice.
-
-The Licensee may distribute binaries compiled with STLport (whether
-original or modified) without any royalties or restrictions.
-
-The Licensee may distribute original or modified STLport sources,
-provided that:
-
- - The conditions indicated in the above permission notice are met;
-
- - The following copyright notices are retained when present, and
- conditions provided in accompanying permission notices are met:
-
- Copyright 1994 Hewlett-Packard Company
-
- Permission to use, copy, modify, distribute and sell this software and
- its documentation for any purpose is hereby granted without fee, provided
- that the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation. Hewlett-Packard Company makes no representations about
- the suitability of this software for any purpose. It is provided "as is"
- without express or implied warranty.
-
- Copyright 1996,97 Silicon Graphics Computer Systems, Inc.
-
- Permission to use, copy, modify, distribute and sell this software and
- its documentation for any purpose is hereby granted without fee, provided
- that the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation. Silicon Graphics makes no representations about
- the suitability of this software for any purpose. It is provided "as is"
- without express or implied warranty.
-
- Copyright 1997 Moscow Center for SPARC Technology.
-
- Permission to use, copy, modify, distribute and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation. Moscow Center for SPARC Technology makes no representations
- about the suitability of this software for any purpose. It is provided
- "as is" without express or implied warranty.
-
-____
-
For C preprocessor - built in main/ucpp/:
- BSD license
Modified: openoffice/trunk/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryFixes.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryFixes.mk (original)
+++ openoffice/trunk/main/RepositoryFixes.mk Mon Nov 18 16:26:19 2013
@@ -34,10 +34,8 @@ gb_Library_FILENAMES := $(patsubst salhe
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
endif
@@ -49,10 +47,12 @@ gb_Library_FILENAMES := $(patsubst jvmfw
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
+ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.4) # default to use libc++
+gb_Library_FILENAMES := $(patsubst stl:%,stl:libc++.dylib,$(gb_Library_FILENAMES))
+else # use libstdc++ instead on ancient MacOSX targets
gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES))
-gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
endif
+gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
endif
@@ -75,15 +75,7 @@ gb_Library_FILENAMES := $(patsubst xslt:
gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
-else
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
-else
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
-endif
-endif
gb_Library_NOILIBFILENAMES:=\
icule \
@@ -108,10 +100,8 @@ gb_Library_DLLFILENAMES := $(patsubst jv
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
else
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
@@ -131,15 +121,7 @@ gb_Library_FILENAMES := $(patsubst rdf:i
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
-else
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
-else
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
-endif
-endif
gb_Library_NOILIBFILENAMES:=\
advapi32 \
@@ -248,18 +230,14 @@ gb_Library_FILENAMES := $(patsubst salhe
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
endif
# we do not require a known rule for these, when using system libs
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
ifeq ($(SYSTEM_LIBXML),YES)
gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS))
Modified: openoffice/trunk/main/autodoc/source/exes/adc_uni/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/autodoc/source/exes/adc_uni/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/autodoc/source/exes/adc_uni/makefile.mk (original)
+++ openoffice/trunk/main/autodoc/source/exes/adc_uni/makefile.mk Mon Nov 18 16:26:19 2013
@@ -72,11 +72,11 @@ APP1OBJS= $(OBJ)$/main.obj
APP1RPATH=SDK
.IF "$(GUI)"=="WNT"
-APP1STDLIBS= $(LIBSTLPORT) $(COSVLIB) $(UDMLIB)
+APP1STDLIBS= $(COSVLIB) $(UDMLIB)
.ELSE
.IF "$(OS)"=="MACOSX"
# See <http://porting.openoffice.org/servlets/ReadMsg?list=mac&msgNo=6911>:
-APP1STDLIBS= $(LIBSTLPORT) -Wl,-all_load -ludm -lcosv
+APP1STDLIBS= -Wl,-all_load -ludm -lcosv
.ELSE
APP1STDLIBS= -lcosv -ludm
.ENDIF
Modified: openoffice/trunk/main/basebmp/test/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basebmp/test/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/basebmp/test/makefile.mk (original)
+++ openoffice/trunk/main/basebmp/test/makefile.mk Mon Nov 18 16:26:19 2013
@@ -63,13 +63,6 @@ CDEFS+=-xalias_level=compatible
.ENDIF
.ENDIF
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
CFLAGSCXX += $(CPPUNIT_CFLAGS)
# --- Common ----------------------------------------------------------
Modified: openoffice/trunk/main/basegfx/source/workbench/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/source/workbench/Makefile?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/basegfx/source/workbench/Makefile (original)
+++ openoffice/trunk/main/basegfx/source/workbench/Makefile Mon Nov 18 16:26:19 2013
@@ -63,7 +63,7 @@
#test : bezierclip.cxx convexhull.cxx
# g++ -Wall -g \
# -I. -I. -I../inc -I./inc -I./unx/inc -I./unxlngi4/inc -I. -I/develop4/update/SRX644/unxlngi4/inc.m4/stl -I/develop4/update/SRX644/unxlngi4/inc.m4/external -I/develop4/update/SRX644/unxlngi4/inc.m4 -I/develop4/update/SRX644/src.m4/solenv/unxlngi4/inc -I/net/grande/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/include -I/develop4/update/SRX644/src.m4/solenv/inc -I/develop4/update/SRX644/unxlngi4/inc.m4/stl -I/net/grande.germany/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/redhat60/usr/include -I/net/grande.germany/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/redhat60/usr/include/X11 -I/develop4/update/SRX644/src.m4/res -I/net/grande/develop6/update/dev/Linux_JDK_1.4.0/include -I/net/grande/develop6/update/dev/Linux_JDK_1.4.0/include/linux -I. -I./res -I. \
-# -include preinclude.h -D_USE_NAMESPACE -DGLIBC=2 -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -D_STLP_DEBUG \
+# -include preinclude.h -D_USE_NAMESPACE -DGLIBC=2 -D_USE_NAMESPACE=1 -D_STLP_DEBUG \
# bezierclip.cxx convexhull.cxx -o bezierclip
prog : bezierclip.cxx convexhull.cxx
Modified: openoffice/trunk/main/basegfx/test/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/test/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/basegfx/test/makefile.mk (original)
+++ openoffice/trunk/main/basegfx/test/makefile.mk Mon Nov 18 16:26:19 2013
@@ -37,14 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
@all:
@echo "cppunit disabled. nothing do do."
-.ELSE # "$(WITH_CPPUNIT)" != "YES"
-
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
+.ELSE
CFLAGSCXX += $(CPPUNIT_CFLAGS)
Modified: openoffice/trunk/main/configmgr/source/partial.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configmgr/source/partial.hxx?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/configmgr/source/partial.hxx (original)
+++ openoffice/trunk/main/configmgr/source/partial.hxx Mon Nov 18 16:26:19 2013
@@ -50,7 +50,7 @@ public:
private:
struct Node {
- typedef boost::unordered_map< rtl::OUString, Node > Children;
+ typedef boost::unordered_map< rtl::OUString, Node, rtl::OUStringHash > Children;
Node(): startInclude(false) {}
void clear() { startInclude=false; children.clear(); }
Modified: openoffice/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Mon Nov 18 16:26:19 2013
@@ -643,17 +643,8 @@ AC_ARG_WITH(system-redland,
[ --with-system-redland Use redland library already on system
],,)
AC_ARG_WITH(stlport,
-[ --with-stlport The location that STLport is installed in. The STL
- header files are assumed to be in
- stlport-home/stlport and the STLPort library in
- stlport-home/lib.
-
- Usage: --with-stlport=<absolute path to stlport home>
-
- Warning: disabling using --without-stlport or
- enabling using --with-stlport on a platform that
- defaults to the opposite will break ABI compatibility
-], WITH_STLPORT=$withval , WITH_STLPORT=auto)
+[ --with-stlport Only building --without-stlport is supported.
+], WITH_STLPORT=$withval , WITH_STLPORT=NO)
AC_ARG_WITH(jdk-home,
[ --with-jdk-home if you have installed JDK 1.3 or later on your system
please supply the path here.
@@ -2417,7 +2408,7 @@ dnl ====================================
dnl Set the gcc/gxx include directories
dnl ===================================================================
# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path
-# often contains an i386 which is expanded as a macro. Solved in stlport.
+# often contains an i386 which is expanded as a macro.
if test "$GXX" = "yes"; then
AC_MSG_CHECKING([for g++ include path])
if test -z "$with_gxx_include_path"; then
@@ -2704,115 +2695,12 @@ dnl Checks for what the default STL shou
dnl ===================================================================
AC_MSG_CHECKING([what the default STL should be])
DEFAULT_TO_STLPORT="no"
- if test "$_os" = "Linux"; then
- case "$build_cpu" in
- i?86)
- case "$build_os" in k*bsd*-gnu*)
- DEFAULT_TO_STLPORT="no"
- ;;
- *)
- DEFAULT_TO_STLPORT="yes"
- ;;
- esac
- ;;
- *)
- DEFAULT_TO_STLPORT="no"
- ;;
- esac
- elif test "$_os" = "SunOS"; then
- DEFAULT_TO_STLPORT="yes"
- elif test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
- DEFAULT_TO_STLPORT="yes"
- elif test "$_os" = "OS2"; then
- DEFAULT_TO_STLPORT="yes"
- elif test "$_os" = "FreeBSD"; then
- DEFAULT_TO_STLPORT="yes"
- fi
- if test "$DEFAULT_TO_STLPORT" = "yes"; then
- AC_MSG_RESULT([stlport])
- else
- AC_MSG_RESULT([system])
- fi
- if test "$WITH_STLPORT" = "auto"; then
- WITH_STLPORT=$DEFAULT_TO_STLPORT
- fi
-
-dnl ===================================================================
-dnl Checks for STLPORT
-dnl ===================================================================
- AC_MSG_CHECKING([for STL providing headers])
- STLPORT4=""
- USE_SYSTEM_STL=""
- if test "$WITH_STLPORT" = "yes"; then
- AC_MSG_RESULT([using internal stlport.])
- if test "$DEFAULT_TO_STLPORT" != "yes"; then
- AC_MSG_WARN([using stlport. Warning, breaks your ABI compatibility!])
- echo "using stlport. Warning: breaks your ABI compatibility!" >>warn
- fi
- elif test "$WITH_STLPORT" = "no"; then
- AC_MSG_RESULT([using system STL])
- USE_SYSTEM_STL="YES"
- if test "$DEFAULT_TO_STLPORT" != "no"; then
- AC_MSG_WARN([using system STL. Warning, breaks your ABI compatibility!])
- echo "using system STL. Warning: breaks your ABI compatibility!" >>warn
- fi
- else
- STLPORT4=$WITH_STLPORT
- if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
- AC_TRY_CPP($STLPORT4/stlport/hash_map, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([STLport headers not found.]))
- else
- dnl AC_TRY_CPP doesn't work for MSVC because C++ preprocessor is not found by autoconf.
- if test -f "$STLPORT4/stlport/hash_map"; then
- AC_MSG_RESULT([checked.])
- else
- AC_MSG_ERROR([STLport headers not found.])
- fi
- fi
- if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
- AC_MSG_CHECKING([for STLport libraries])
- if test "$_os" = "SunOS"; then
- if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
- AC_MSG_RESULT([checked])
- elif test -f "$STLPORT4/lib/libstlport.so"; then
- AC_MSG_RESULT([checked])
- STLPORT_VER=500
- else
- AC_MSG_ERROR([STLport libraries not found])
- fi
- elif test "$_os" = "Darwin"; then
- if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then
- AC_MSG_RESULT([checked])
- elif test -f "$STLPORT4/lib/libstlport.dylib"; then
- AC_MSG_RESULT([checked])
- STLPORT_VER=500
- else
- AC_MSG_ERROR([STLport libraries not found])
- fi
- else
- if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
- AC_MSG_RESULT([checked])
- elif test -f "$STLPORT4/lib/libstlport.so"; then
- AC_MSG_RESULT([checked])
- STLPORT_VER=500
- else
- AC_MSG_ERROR([STLport libraries not found])
- fi
- fi
- fi
- if test "$DEFAULT_TO_STLPORT" != "yes"; then
- AC_MSG_WARN([using stlport. Warning: breaks your ABI compatibility!])
- echo "using stlport. Warning: breaks your ABI compatibility!" >>warn
- fi
- fi
-
-if test -z "$STLPORT4"; then
- STLPORT4="NO_STLPORT4"
-fi
-if test -z "$STLPORT_VER"; then
- STLPORT_VER=400
+if test "$WITH_STLPORT" != "no"; then
+ AC_MSG_ERROR([Option --with-stlport is no longer available.])
+else
+ USE_SYSTEM_STL="YES"
fi
-AC_SUBST(STLPORT4)
-AC_SUBST(STLPORT_VER)
+
AC_SUBST(USE_SYSTEM_STL)
dnl ===================================================================
@@ -2883,6 +2771,7 @@ fi
dnl ===================================================================
dnl system stl sanity tests
dnl ===================================================================
+if false ; then # TODO: update TR1 compliant STLs
if test "$USE_SYSTEM_STL" = "YES"; then
AC_MSG_CHECKING([system stl sanity])
AC_LANG_PUSH([C++])
@@ -2958,6 +2847,7 @@ _ACEOF
AC_LANG_POP([C++])
fi
+fi # endof TODO: update TR1 compliant STLs
AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
Modified: openoffice/trunk/main/connectivity/source/commontools/dbtools.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/commontools/dbtools.cxx?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/commontools/dbtools.cxx (original)
+++ openoffice/trunk/main/connectivity/source/commontools/dbtools.cxx Mon Nov 18 16:26:19 2013
@@ -1766,14 +1766,14 @@ namespace
{
if ( m_aSet.empty() )
return m_xSource->hasElements();
- return ::std::count(m_aSet.begin(),m_aSet.end(),false) != 0;
+ return (::std::find(m_aSet.begin(),m_aSet.end(),false) != m_aSet.end());
}
// ::com::sun::star::container::XIndexAccess
virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException)
{
if ( m_aSet.empty() )
return m_xSource->getCount();
- return ::std::count(m_aSet.begin(),m_aSet.end(),false);
+ return std_bitset_count(m_aSet.begin(),m_aSet.end(),false);
}
virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
{
@@ -1818,7 +1818,7 @@ void askForParameters(const Reference< X
Reference<XNameAccess> xParamsAsNames(xParamsAsIndicies, UNO_QUERY);
sal_Int32 nParamCount = xParamsAsIndicies.is() ? xParamsAsIndicies->getCount() : 0;
::std::bit_vector aNewParameterSet( _aParametersSet );
- if ( nParamCount || ::std::count(aNewParameterSet.begin(),aNewParameterSet.end(),true) != nParamCount )
+ if ( nParamCount || std_bitset_count(aNewParameterSet.begin(),aNewParameterSet.end(),true) != nParamCount )
{
static const ::rtl::OUString PROPERTY_NAME(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME));
aNewParameterSet.resize(nParamCount ,false);
Modified: openoffice/trunk/main/cosv/source/unittest/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cosv/source/unittest/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/cosv/source/unittest/makefile.mk (original)
+++ openoffice/trunk/main/cosv/source/unittest/makefile.mk Mon Nov 18 16:26:19 2013
@@ -19,8 +19,6 @@
#
#**************************************************************
-
-
PRJ=..$/..
PRJNAME=cosv
@@ -37,40 +35,21 @@ PRJINC=$(PRJ)$/source
.INCLUDE : $(PRJ)$/source$/fullcpp.mk
-
-
-
# --- Files --------------------------------------------------------
OBJFILES= \
$(OBJ)$/file_ut.obj \
$(OBJ)$/simplestring_ut.obj
-
-
-
APP1TARGET= $(TARGET)
APP1STACK= 1000000
APP1OBJS= $(OBJ)$/ut_main.obj
-.IF "$(GUI)"=="WNT"
-APP1STDLIBS= $(LIBSTLPORT)
-.ELSE
-.IF "$(OS)"=="MACOSX"
-APP1STDLIBS= $(LIBSTLPORT)
-.ENDIF
-.ENDIF
-
-
APP1LIBS= $(LB)$/$(TARGET).lib $(LB)$/cosv.lib
-
APP1DEPN= $(LB)$/$(TARGET).lib $(LB)$/cosv.lib
-
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-
-
Modified: openoffice/trunk/main/cpputools/source/unoexe/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cpputools/source/unoexe/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/cpputools/source/unoexe/makefile.mk (original)
+++ openoffice/trunk/main/cpputools/source/unoexe/makefile.mk Mon Nov 18 16:26:19 2013
@@ -70,7 +70,7 @@ APP1RPATH=UREBIN
# Include all relevant (see ure/source/README) dynamic libraries, so that C++
# UNO components running in the uno executable have a defined environment
-# (stlport, unxlngi6 libstdc++.so.6, and wntmsci10 uwinapi.dll are already
+# (unxlngi6 libstdc++.so.6, and wntmsci10 uwinapi.dll are already
# included via APP1STDLIB, unxlngi6 libgcc_s.so.1 and wntmsci10 msvcr71.dll and
# msvcp71.dll are magic---TODO):
APP1STDLIBS= \
Modified: openoffice/trunk/main/desktop/source/pagein/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/pagein/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/pagein/makefile.mk (original)
+++ openoffice/trunk/main/desktop/source/pagein/makefile.mk Mon Nov 18 16:26:19 2013
@@ -137,14 +137,6 @@ $(MISC)$/$(TARGET)-common : makefile.mk
@-echo $(URELIBPATH)$/bootstrap$(UNODLLPOST) >> $@
@-echo $(URELIBPATH)$/$(DLLPRE)reg$(UDKDLLPOST) >> $@
@-echo $(URELIBPATH)$/$(DLLPRE)store$(UDKDLLPOST) >> $@
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(COMNAME)" == "gcc2" || "$(COMNAME)" == "gcc3"
- @-echo $(URELIBPATH)$/$(DLLPRE)stlport_gcc$(DLLPOST) >> $@
-.ENDIF # gcc
-.IF "$(COMNAME)" == "sunpro5"
- @-echo $(URELIBPATH)$/$(DLLPRE)stlport_sunpro$(DLLPOST) >> $@
-.ENDIF # sunpro5
-.ENDIF # SYSTEM_STL
@-echo $(URELIBPATH)$/$(DLLPRE)uno_cppuhelper$(COMID)$(UDKDLLPOST) >> $@
@-echo $(URELIBPATH)$/$(DLLPRE)uno_cppu$(UDKDLLPOST) >> $@
@-echo $(URELIBPATH)$/$(DLLPRE)uno_sal$(UDKDLLPOST) >> $@
Modified: openoffice/trunk/main/editeng/source/uno/unoipset.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/uno/unoipset.cxx?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/uno/unoipset.cxx (original)
+++ openoffice/trunk/main/editeng/source/uno/unoipset.cxx Mon Nov 18 16:26:19 2013
@@ -27,8 +27,6 @@
#include <svl/eitem.hxx>
#include <tools/list.hxx>
-#include <hash_map>
-#include <vector>
#include <svl/itemprop.hxx>
#include <editeng/unoipset.hxx>
Modified: openoffice/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Mon Nov 18 16:26:19 2013
@@ -168,24 +168,6 @@ if ( true )
URL1 = http://archive.apache.org/dist/apr/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-if ( USE_SYSTEM_STL != YES )
- MD5 = c441926f3a552ed3e5b274b62e86af16
- name = STLport-4.0.tar.gz
- # This seems to be the original host, but the MD5 sum does not match.
- # URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.0.tar.gz/download
- URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-
-if ( USE_SYSTEM_STL != YES )
- MD5 = 18f577b374d60b3c760a3a3350407632
- name = STLport-4.5.tar.gz
- URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.5.tar.gz/download
- URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-
-if ( USE_SYSTEM_STL != YES )
- MD5 = 7376930b0d3f3d77a685d94c4a3acda8
- name = STLport-4.5-0119.tar.gz
- URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
-
if (SYSTEM_LIBXML != YES)
MD5 = 8127a65e8c3b08856093099b52599c86
name = libxml2-2.7.8.tar.gz
Modified: openoffice/trunk/main/nss/nss.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/nss/nss.patch?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/nss/nss.patch (original)
+++ openoffice/trunk/main/nss/nss.patch Mon Nov 18 16:26:19 2013
@@ -5,8 +5,8 @@
$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
else
- $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
-+ #We remove stl from the paths to avoid that rc.exe finds the stlport of
-+ #OOo. stlport includes the system stl which will fail. By removing it,
++ #We remove stl from the paths to avoid that rc.exe finds the stl wrapper
++ #of AOO. stlport includes the system stl which will fail. By removing it,
+ #rc will use the stl from the system if the path is in the INCLUDE
+ #variable.
+ INCLUDE="$(subst /stl,,$(INCLUDE))" $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
Modified: openoffice/trunk/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile (original)
+++ openoffice/trunk/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile Mon Nov 18 16:26:19 2013
@@ -71,14 +71,14 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
#$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
Modified: openoffice/trunk/main/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/examples/DevelopersGuide/Components/CppComponent/Makefile?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/odk/examples/DevelopersGuide/Components/CppComponent/Makefile (original)
+++ openoffice/trunk/main/odk/examples/DevelopersGuide/Components/CppComponent/Makefile Mon Nov 18 16:26:19 2013
@@ -104,14 +104,14 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(
-$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(SAMPLE_GEN_OUT)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
#$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
@@ -176,10 +176,10 @@ $(OUT_BIN)/_$(APP1_NAME)$(EXE_EXT) : $(S
-$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT))
ifeq "$(OS)" "WIN"
$(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(SAMPLE_GEN_OUT)/$(basename $(@F)).map \
- $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB)
+ $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
else
$(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS_BIN) $@
endif
Modified: openoffice/trunk/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile (original)
+++ openoffice/trunk/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile Mon Nov 18 16:26:19 2013
@@ -79,13 +79,13 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_MISC))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_MISC)/$(COMP_NAME).map $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
Modified: openoffice/trunk/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile (original)
+++ openoffice/trunk/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile Mon Nov 18 16:26:19 2013
@@ -52,7 +52,7 @@ $(OUT_SHL_SLO)/%.$(OBJ_EXT) : %.c
$(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)$(SHL_NAME).$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(LIBRARY_LINK_FLAGS) $(LINK_LIBS) $(LINK_JAVA_LIBS) -o $@ $< \
- -ljawt $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB)
+ -ljawt $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STDC++LIB)
.PHONY: clean
clean :
Modified: openoffice/trunk/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile (original)
+++ openoffice/trunk/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile Mon Nov 18 16:26:19 2013
@@ -73,13 +73,13 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
Modified: openoffice/trunk/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile (original)
+++ openoffice/trunk/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile Mon Nov 18 16:26:19 2013
@@ -70,13 +70,13 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
Modified: openoffice/trunk/main/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile (original)
+++ openoffice/trunk/main/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile Mon Nov 18 16:26:19 2013
@@ -62,10 +62,10 @@ $(OUT_BIN)/%$(EXE_EXT) : $(SAMPLE_OBJ_OU
-$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT))
ifeq "$(OS)" "WIN"
$(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(SAMPLE_GEN_OUT)/$(subst $(EXE_EXT),.map,$(@F)) \
- $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB)
+ $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
else
$(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS_BIN) $@
endif
Modified: openoffice/trunk/main/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile (original)
+++ openoffice/trunk/main/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile Mon Nov 18 16:26:19 2013
@@ -68,10 +68,10 @@ $(OUT_BIN)/$(COMPONENT_NAME)$(EXE_EXT) :
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
ifeq "$(OS)" "WIN"
$(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(OUT_COMP_GEN)/$(subst $(EXE_EXT),.map,$(@F)) \
- $(OBJFILES) $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB)
+ $(OBJFILES) $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
else
$(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $(OBJFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS_BIN) $@
endif
Modified: openoffice/trunk/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile (original)
+++ openoffice/trunk/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile Mon Nov 18 16:26:19 2013
@@ -55,10 +55,10 @@ $(OUT_BIN)/_$(APP_NAME)$(EXE_EXT) : $(OU
-$(MKDIR) $(subst /,$(PS),$(OUT_APP_GEN))
ifeq "$(OS)" "WIN"
$(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(OUT_APP_GEN)/$(basename $(@F)).map \
- $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB)
+ $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
else
$(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS_BIN) $@
endif
Modified: openoffice/trunk/main/odk/pack/copying/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/pack/copying/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/odk/pack/copying/makefile.mk (original)
+++ openoffice/trunk/main/odk/pack/copying/makefile.mk Mon Nov 18 16:26:19 2013
@@ -82,13 +82,6 @@ LIBLIST = \
$(DESTDIRLIB)/irmcxt.lib \
$(DESTDIRLIB)/ipurpenvhelper3MSC.lib
-.IF "$(COMEX)"=="8"
- LIBLIST += $(DESTDIRLIB)/stlport_vc7.lib
-.ELIF "$(COMEX)"=="10" || "$(COMEX)"=="11" || "$(COMEX)"=="12"
- LIBLIST += $(DESTDIRLIB)/stlport_vc71.lib
-.ELSE
- LIBLIST += $(DESTDIRLIB)/stlport_vc6.lib
-.ENDIF
.ENDIF
.IF "$(OS)"=="LINUX"
Modified: openoffice/trunk/main/odk/util/odk_rules.pmk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/util/odk_rules.pmk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/odk/util/odk_rules.pmk (original)
+++ openoffice/trunk/main/odk/util/odk_rules.pmk Mon Nov 18 16:26:19 2013
@@ -84,11 +84,7 @@ $(DESTDIR)/cfgWin.js : $(PRJ)/cfgWin.js
$(DESTDIRSETTINGS)/%.mk : $(PRJ)/settings/%.mk
@@-rm -f $@
-.IF "$(COMEX)"=="7"
- $(MY_TEXTCOPY) $< | $(SED) -e 's/stlport_vc7/stlport_vc6/' $@
-.ELSE
$(MY_TEXTCOPY) $< $@
-.ENDIF
$(DESTDIRXML)/module-description.dtd : $(XMLOUT)/module-description.dtd
@@-rm -f $@
Modified: openoffice/trunk/main/postprocess/rebase/coffbase.txt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/rebase/coffbase.txt?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/rebase/coffbase.txt (original)
+++ openoffice/trunk/main/postprocess/rebase/coffbase.txt Mon Nov 18 16:26:19 2013
@@ -246,8 +246,6 @@ spellmi.dll 0x000000005e5e0000 0x00
splmi.dll 0x000000005e5a0000 0x00030000
srtrs1.dll 0x000000005e570000 0x00020000
ssleay32.dll 0x000000005e520000 0x00040000
-stlport_vc7145.dll 0x000000005e470000 0x000a0000
-stlport_vc71_stldebug45.dll 0x000000005e340000 0x00120000
stocservices.uno.dll 0x000000005e310000 0x00020000
store3.dll 0x000000005e2e0000 0x00020000
streams.uno.dll 0x000000005e2b0000 0x00020000
Modified: openoffice/trunk/main/sal/cppunittester/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/cppunittester/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/sal/cppunittester/makefile.mk (original)
+++ openoffice/trunk/main/sal/cppunittester/makefile.mk Mon Nov 18 16:26:19 2013
@@ -35,13 +35,6 @@ all:
.ELSE
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
CFLAGSCXX += $(CPPUNIT_CFLAGS)
OBJFILES = $(APP1OBJS)
Modified: openoffice/trunk/main/sal/inc/rtl/string.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/inc/rtl/string.hxx?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/sal/inc/rtl/string.hxx (original)
+++ openoffice/trunk/main/sal/inc/rtl/string.hxx Mon Nov 18 16:26:19 2013
@@ -419,7 +419,7 @@ public:
@return a hash code value for this object.
- @see rtl::OStringHash for convenient use of STLPort's hash_map
+ @see rtl::OStringHash for convenient use of hash_map / unordered_map
*/
sal_Int32 hashCode() const SAL_THROW(())
{
@@ -911,7 +911,7 @@ public:
/** A helper to use OStrings with hash maps.
Instances of this class are unary function objects that can be used as
- hash function arguments to STLPort's hash_map and similar constructs.
+ hash function arguments to unordered_map, hash_map and similar constructs.
*/
struct OStringHash
{
Modified: openoffice/trunk/main/sal/rtl/source/bootstrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/rtl/source/bootstrap.cxx?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/sal/rtl/source/bootstrap.cxx (original)
+++ openoffice/trunk/main/sal/rtl/source/bootstrap.cxx Mon Nov 18 16:26:19 2013
@@ -605,8 +605,6 @@ void Bootstrap_Impl::expandValue(
namespace {
struct bootstrap_map {
- // map<> may be preferred here, but hash_map<> is implemented fully inline,
- // thus there is no need to link against the stlport:
typedef std::hash_map<
rtl::OUString, Bootstrap_Impl *,
rtl::OUStringHash, std::equal_to< rtl::OUString >,
Modified: openoffice/trunk/main/sal/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/util/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/sal/util/makefile.mk (original)
+++ openoffice/trunk/main/sal/util/makefile.mk Mon Nov 18 16:26:19 2013
@@ -125,20 +125,6 @@ SHL1STDLIBS+= -z allextract -staticlib=C
SHL1STDLIBS=-lmmap -lpthread
.ENDIF # OS2
-# If we compile sal with STLport checking iterators
-# we need to link against the STLport
-.IF "$(USE_STLP_DEBUG)" != ""
-SHL1STDLIBS+=$(LIBSTLPORT)
-.ENDIF
-
-#The irony that using the system STL instead of
-#stlport requires that we link libsal with the
-#LIBSTLPORT alias which is not required when using
-#stlport is not lost on me
-.IF "$(USE_SYSTEM_STL)"=="YES"
-SHL1STDLIBS+=$(LIBSTLPORT)
-.ENDIF
-
.IF "$(OS)"=="MACOSX"
SHL1STDLIBS+=-framework CoreFoundation -framework Carbon
.ENDIF
Modified: openoffice/trunk/main/sax/qa/cppunit/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sax/qa/cppunit/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/sax/qa/cppunit/makefile.mk (original)
+++ openoffice/trunk/main/sax/qa/cppunit/makefile.mk Mon Nov 18 16:26:19 2013
@@ -38,13 +38,6 @@ ENABLE_EXCEPTIONS=TRUE
.ELSE # "$(WITH_CPPUNIT)" != "YES"
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
CFLAGSCXX += $(CPPUNIT_CFLAGS)
DLLPRE = # no leading "lib" on .so files
Modified: openoffice/trunk/main/scp2/inc/macros.inc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/inc/macros.inc?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/inc/macros.inc (original)
+++ openoffice/trunk/main/scp2/inc/macros.inc Mon Nov 18 16:26:19 2013
@@ -541,11 +541,6 @@ End
#define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
#define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
-#if defined _STLP_DEBUG
-#define SCP2_STDLP_DEBUG "d"
-#else
-#define SCP2_STDLP_DEBUG ""
-#endif
#else
#define SCP2_URE_DL_DIR gid_Dir_Ure_Lib
#define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX)
Modified: openoffice/trunk/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ openoffice/trunk/main/scp2/source/ooo/makefile.mk Mon Nov 18 16:26:19 2013
@@ -116,10 +116,6 @@ SCPDEFS+=-DSYSTEM_LIBXSLT
SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
.ENDIF
-.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
-SCPDEFS+=-DUSE_SYSTEM_STL
-.ENDIF
-
.IF "$(WITH_MYSPELL_DICTS)" == "NO"
SCPDEFS+=-DWITHOUT_MYSPELL_DICTS
.ENDIF
Modified: openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp Mon Nov 18 16:26:19 2013
@@ -417,8 +417,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Wininetbe,
gid_File_Lib_Macbe,
gid_File_Lib_Gdiplus,
- gid_File_Lib_Stlport_Vc6,
- gid_File_Lib_Stlport_Vc7,
gid_File_Tabaction,
gid_File_Lib_Fps_Office,
gid_File_Lib_Fpicker,
Modified: openoffice/trunk/main/scp2/source/ooo/ure.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/ure.scp?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/ure.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/ure.scp Mon Nov 18 16:26:19 2013
@@ -823,46 +823,6 @@ File gid_File_Dl_Libxml2
End
#endif
-#if !defined USE_SYSTEM_STL || \
- (defined USE_SYSTEM_STL && defined _C52 && defined IS_LP64)
-File gid_File_Dl_Stlport
- TXT_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
-#if defined _gcc3 && defined WNT
-#if defined _STLP_DEBUG
- Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug");
-#else
- Name = SCP2_URE_DL_NORMAL("libstlport_gcc");
-#endif
-#elif defined _gcc3
-#if defined _STLP_DEBUG
- Name = SCP2_URE_DL_NORMAL("stlport_gcc_stldebug");
-#else
- Name = SCP2_URE_DL_NORMAL("stlport_gcc");
-#endif
-#elif defined SOLARIS
-#if defined IS_LP64
- Name = SCP2_URE_DL_VER("stlport", "1");
-#else
-#if defined _STLP_DEBUG
- Name = SCP2_URE_DL_NORMAL("stlport_sunpro_debug");
-#else
- Name = SCP2_URE_DL_NORMAL("stlport_sunpro");
-#endif
-#endif
-#elif defined WNT && (defined(M1310) || defined(M1400) || defined(M1500) )
-#if defined _STLP_DEBUG
- Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
-#else
- Name = SCP2_URE_DL_NORMAL("stlport_vc7145");
-#endif
-#else
-#error "stlport dynamic library: unsupported platform"
-#endif
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-#endif
-
#if defined _gcc3 && !(defined NETBSD \
|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(OS2))
File gid_File_Dl_GccS
@@ -1072,7 +1032,6 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Dl_Textoutstream,
gid_File_Dl_Uuresolver,
gid_File_Dl_Libxml2,
- gid_File_Dl_Stlport,
gid_File_Dl_GccS,
gid_File_Dl_Stdcpp,
gid_File_Lib_Mingw_GccS_Ure,
Modified: openoffice/trunk/main/scp2/source/winexplorerext/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/winexplorerext/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/winexplorerext/makefile.mk (original)
+++ openoffice/trunk/main/scp2/source/winexplorerext/makefile.mk Mon Nov 18 16:26:19 2013
@@ -46,10 +46,6 @@ PARFILES= \
registryitem_winexplorerext.par
.ENDIF
-.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
-SCPDEFS+=-DUSE_SYSTEM_STL
-.ENDIF
-
ULFFILES= \
module_winexplorerext.ulf
Modified: openoffice/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Mon Nov 18 16:26:19 2013
@@ -94,8 +94,7 @@ my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNA
my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG,
$USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
$SOLARENVINC, $USR_DT, $USR_OPENWIN, $XLIB, $XINC,
- $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
- $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
+ $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $PERL_PATH );
# Environment variables.
my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
@@ -109,7 +108,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAV
$COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME,
$USE_DIRECTX5, $ATL_LIB, $ATL_LIB_X64, $HAVE_ATLTHUNK, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLABUILD,
+ $WIN_GNUCOPY, $WIN_TOUCH, $MOZILLABUILD,
$PROEXT, $TARFILE_LOCATION,
$ENABLE_HUNSPELL, $ENABLE_HYPHEN,
$SYSTEM_PYTHON, $EPM_FLAGS);
@@ -145,10 +144,8 @@ $I = " -I"; # in
$L = " -L"; # library search path
$D = " -D"; # define search path
$empty = ""; # used as argument
-$no_stl = "NO_STLPORT4"; # possible argument
$warnfile = "warn"; # logfile configure warnings.
$Warning = ""; # container for warning messages
-$STLPORT4 = '@STLPORT4@'; # Location of STLport4
$SYSTEM_PYTHON = '@SYSTEM_PYTHON@';
$JDK = '@JDK@';
$JAVAFLAGS = '@JAVAFLAGS@';
@@ -857,11 +854,6 @@ else
$OOO_SHELL = '@SHELLPATH@'."\/bash";
}
-if ( '@STLPORT4@' eq $no_stl )
-{
- $STLPORT4 = "$no_stl";
-}
-
# ml.exe assembler path for Windows users.
if ($platform =~ m/cygwin/)
{ $ASM_PATH = PathFormat('@ASM_HOME@');
@@ -909,19 +901,6 @@ if ($GUI eq "OS2")
$outfile_bat =~ s/set$/cmd/i;
}
-if ($STLPORT4 ne $no_stl) {
- $ps_STLPORT_LIB = $ps.'$STLPORT4'.$LIB64;
- $L_STLPORT_LIB = $L.'$STLPORT4'.$LIB64;
- $STLPORT_stlport = $I.'$STLPORT4'.$ds.'stlport';
- $STLPORT_inc_stlport = $I.'$STLPORT4'.$ds.'include'.$ds.'stlport';
-} else {
- $ps_STLPORT_LIB = "";
- $L_STLPORT_LIB = "";
- $STLPORT_stlport = $I.$SRC_ROOT.$SOLVER.$ds.$UPD.$ds.$INPATH.$INC.$ds."stl";
- $STLPORT_inc_stlport = "";
-}
-
-
# Windows NT only variables
if ($platform =~ m/cygwin/)
{
@@ -1061,10 +1040,6 @@ if ($platform =~ m/cygwin|os2/)
$ILIB = $cur_dir;
- if ($STLPORT4 ne $no_stl) {
- $ILIB .= $wps.$STLPORT4.$LIB64;
- }
-
# Mingw is different
if ( $COM eq "MSC" )
{ $ILIB .= $wps.$SOLARVER.$ds.$INPATH.$LIB.
@@ -1219,7 +1194,6 @@ elsif ($platform =~ m/cygwin/)
if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
$PATH .= $ps.$tmppath;
}
- $PATH .= $ps_STLPORT_LIB;
# nsis path for Windows users.
$NSIS_PATH = PathFormat('@NSIS_PATH@');
$tmppath = CygFormat($NSIS_PATH);
@@ -1334,7 +1308,6 @@ if ($platform =~ m/solaris/)
$L.$JRELIBDIR.
$L.$JRETOOLKITDIR.
$L.$JRETHREADDIR.
- $L_STLPORT_LIB.
$L.$XLIB;
}
elsif ($platform =~ m/linux|netbasd|osf1|aix|freebsd/)
@@ -1346,18 +1319,15 @@ elsif ($platform =~ m/linux|netbasd|osf1
$L.$JRELIBDIR.
$L.$JRETOOLKITDIR.
$L.$JRETHREADDIR.
- $L_STLPORT_LIB.
$L.$XLIB;
}
elsif ($platform =~ m/cygwin|os2/)
{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
$L.$par_dir.$LIB.
- $L_STLPORT_LIB.
$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
}
elsif ($platform =~ m/darwin/)
{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
- $L_STLPORT_LIB.
$L.$USR_LIB;
# [ed] 6/15/02 Add in X11 libraries onto the library path
if ($GUIBASE eq "unx") {
@@ -1378,11 +1348,9 @@ $SOLARINC = $I.$cur_dir.
if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd/)
{
-$SOLARINC .= $STLPORT_stlport;
if ($platform =~ m/linux|freebsd|netbsd/)
{
# This simply adds an include path, so even cases that break the FHS work
-$SOLARINC .= $STLPORT_inc_stlport;
}
if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
{
@@ -1396,7 +1364,6 @@ if ($platform =~ m/solaris/)
if ($platform =~ m/linux/)
{
# This simply adds an include path, so even cases that break the FHS work
- $SOLARINC .= $STLPORT_inc_stlport;
}
@@ -1436,8 +1403,7 @@ if ($platform =~ m/linux/)
}
}
elsif ($platform =~ m/cygwin/)
-{ $SOLARINC .= $STLPORT_stlport.
- $I.'$JAVA_HOME'.$ds."include".$ds."win32".
+{ $SOLARINC .= $I.'$JAVA_HOME'.$ds."include".$ds."win32".
$I.'$JAVA_HOME'.$ds."include";
# Mingw is different
if ( $COM eq "MSC" )
@@ -1477,14 +1443,9 @@ elsif ($platform =~ m/cygwin/)
}
}
elsif ($platform =~ m/darwin/)
-{ $SOLARINC .= $STLPORT_stlport.
- $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Versions".$ds."Current".$ds."Headers".
- $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
- # [ed] 6/15/02 Add in X11 headers as appropriate for the build
- if ($GUIBASE eq "unx") {
- $SOLARINC .= $I.$XINC.
- $I.$XINC.$ds."freetype2";
- }
+{
+ my $STLINC .= $I."/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/";
+ $SOLARINC .= $STLINC . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
}
else
{ AddWarning( "set_soenv", "$platform not configured for system dependant include dir" );
@@ -1550,8 +1511,6 @@ ToFile( "ANT_HOME", PathFormat(
ToFile( "ANT_LIB", PathFormat("@ANT_LIB@"), "e" );
ToFile( "ANT", PathFormat("@ANT@"), "e" );
ToFile( "JDKLIB", $JAVA_LIB, "e" );
-ToFile( "STLPORT4", $STLPORT4, "e" );
-ToFile( "STLPORT_VER", "@STLPORT_VER@", "e" );
ToFile( "ASM_PATH", $ASM_PATH, "e" );
ToFile( "BUILD_SOSL", $BUILD_SOSL, "e" );
ToFile( "FRAMEWORKSHOME", $FRAMEWORKSHOME, "e" );
@@ -1716,10 +1675,10 @@ if ( $platform =~ m/darwin/ )
{
# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
# build can assume functions/libraries of that version to be available
-# unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk
+# unless you want to do runtime checks for 10.5 api, you also want to use the 10.7 sdk
# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
# http://developer.apple.com/technotes/tn2002/tn2064.html
- ToFile( "MACOSX_DEPLOYMENT_TARGET", "10.4", "e" );
+ ToFile( "MACOSX_DEPLOYMENT_TARGET", "10.7", "e" );
}
#
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/makefile.mk Mon Nov 18 16:26:19 2013
@@ -35,10 +35,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
#Disable precompiled header
CDEFS+=-Dnot_used_define_to_disable_pch
@@ -61,10 +57,6 @@ STDSHL+= \
$(MSILIB) \
$(SHELL32LIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL+=$(LIBSTLPORTST)
-.ENDIF
-
SHL1OBJS = $(SLOFILES) \
$(SLO)$/seterror.obj
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/patch/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/patch/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/patch/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/patch/makefile.mk Mon Nov 18 16:26:19 2013
@@ -34,10 +34,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
#Disable precompiled header
CDEFS+=-Dnot_used_define_to_disable_pch
@@ -59,10 +55,6 @@ STDSHL += \
$(MSILIB)\
$(SHELL32LIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL += $(LIBSTLPORTST)
-.ENDIF
-
.IF "$(COM)"=="GCC"
STDSHL+= \
$(KERNEL32LIB)\
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/quickstarter/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/quickstarter/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/quickstarter/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/quickstarter/makefile.mk Mon Nov 18 16:26:19 2013
@@ -37,10 +37,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
UWINAPILIB=
# --- Files --------------------------------------------------------
@@ -56,10 +52,6 @@ STDSHL += \
$(SHELL32LIB)\
$(MSILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL += $(LIBSTLPORTST)
-.ENDIF
-
.IF "$(COM)"=="GCC"
STDSHL+= \
$(KERNEL32LIB)\
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/rebase/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/rebase/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/rebase/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/rebase/makefile.mk Mon Nov 18 16:26:19 2013
@@ -36,10 +36,6 @@ MINGW_NODLL=YES
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
UWINAPILIB=
# --- Files --------------------------------------------------------
@@ -55,10 +51,6 @@ STDSHL += \
$(SHELL32LIB)\
$(MSILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL += $(LIBSTLPORTST)
-.ENDIF
-
.IF "$(COM)"=="GCC"
STDSHL+= \
$(KERNEL32LIB)\
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk Mon Nov 18 16:26:19 2013
@@ -35,9 +35,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
CFLAGS+=-DUNICODE -D_UNICODE
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
# --- Files --------------------------------------------------------
@@ -58,10 +55,6 @@ SHL1STDLIBS= $(KERNEL32LIB)\
$(MSILIB)\
$(SHLWAPILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-SHL1STDLIBS+=$(LIBSTLPORTST)
-.ENDIF
-
SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1TARGET = $(TARGET)
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/makefile.mk Mon Nov 18 16:26:19 2013
@@ -36,9 +36,6 @@ MINGW_NODLL=YES
.INCLUDE : settings.mk
CFLAGS+=-DUNICODE -D_UNICODE
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
# --- Files --------------------------------------------------------
@@ -67,10 +64,6 @@ SHL1STDLIBS= $(KERNEL32LIB)\
$(MSILIB)\
$(SHLWAPILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-SHL1STDLIBS+=$(LIBSTLPORTST)
-.ENDIF
-
SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1TARGET = $(TARGET)
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/reg64/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/reg64/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/reg64/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/reg64/makefile.mk Mon Nov 18 16:26:19 2013
@@ -35,10 +35,6 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
#Disable precompiled header
CDEFS+=-Dnot_used_define_to_disable_pch
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/regactivex/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/regactivex/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/regactivex/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/regactivex/makefile.mk Mon Nov 18 16:26:19 2013
@@ -38,11 +38,6 @@ USE_DEFFILE=TRUE
.IF "$(GUI)"=="WNT"
-.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
-CDEFS+=-D_DEBUG
-.ENDIF
-
-
UWINAPILIB=
SLOFILES = $(SLO)$/regactivex.obj
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/makefile.mk Mon Nov 18 16:26:19 2013
@@ -36,9 +36,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
CDEFS+=-DUNICODE
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CDEFS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
UWINAPILIB=
@@ -57,10 +54,6 @@ STDSHL+= \
$(SHELL32LIB)\
$(MSILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL+=$(LIBSTLPORTST)
-.ENDIF
-
SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1TARGET = $(TARGET)
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/makefile.mk Mon Nov 18 16:26:19 2013
@@ -34,10 +34,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
#Disable precompiled header
CDEFS+=-Dnot_used_define_to_disable_pch
@@ -75,10 +71,6 @@ STDSHL += \
$(MSILIB)\
$(SHELL32LIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL += $(LIBSTLPORTST)
-.ENDIF
-
.IF "$(COM)"=="GCC"
STDSHL+= \
$(KERNEL32LIB)\
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/tools/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/tools/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/tools/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/tools/makefile.mk Mon Nov 18 16:26:19 2013
@@ -35,10 +35,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
# --- Files --------------------------------------------------------
.IF "$(GUI)"=="WNT"
@@ -58,10 +54,6 @@ STDSHL+= \
$(ADVAPI32LIB)\
$(MSILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL+=$(LIBSTLPORTST)
-.ENDIF
-
#SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1TARGET = $(TARGET)
Modified: openoffice/trunk/main/slideshow/source/engine/animationfactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/source/engine/animationfactory.cxx?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/slideshow/source/engine/animationfactory.cxx (original)
+++ openoffice/trunk/main/slideshow/source/engine/animationfactory.cxx Mon Nov 18 16:26:19 2013
@@ -611,8 +611,8 @@ namespace slideshow
pGetValue,
pSetValue,
// no modification necessary, use identity functor here
- ::std::identity< typename AnimationBase::ValueType >(),
- ::std::identity< typename AnimationBase::ValueType >() ) );
+ std::identity< typename AnimationBase::ValueType >(),
+ std::identity< typename AnimationBase::ValueType >()));
}
class Scaler
Modified: openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk (original)
+++ openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk Mon Nov 18 16:26:19 2013
@@ -43,7 +43,6 @@ static const Path UPD;
static const String CVER;
static const String LIBXML_CFLAGS;
static const String OS;
-static const String STLPORT_VER;
static const Bool DEBUG;
static const Bool PRODUCT;
Modified: openoffice/trunk/main/solenv/gbuild/gbuild.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/gbuild.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/gbuild.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/gbuild.mk Mon Nov 18 16:26:19 2013
@@ -34,7 +34,6 @@
# PRODUCT
# SOLARINC
# SOLARLIB
-# STLPORT_VER
# UPD
# GXX_INCLUDE_PATH (Linux)
@@ -163,11 +162,6 @@ gb_GLOBALDEFS := \
$(gb_COMPILERDEFS) \
$(gb_CPUDEFS) \
-ifneq ($(USE_SYSTEM_STL),YES)
-gb_GLOBALDEFS += \
- -DSTLPORT_VERSION=$(STLPORT_VER)
-endif
-
ifeq ($(gb_PRODUCT),$(true))
gb_GLOBALDEFS += \
-DPRODUCT \
Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Mon Nov 18 16:26:19 2013
@@ -300,20 +300,10 @@ gb_Library_TARGETTYPEFLAGS := -dynamicli
gb_Library_SYSPRE := lib
gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
gb_Library_PLAINEXT := .dylib
-gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT)
-else
-gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT)
-endif
+gb_Library_RTEXT := $(COMID)$(gb_Library_PLAINEXT)
-ifeq ($(CPUNAME),INTEL)
gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-else # ifeq ($(CPUNAME),POWERPC)
-gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
-gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-endif
gb_Library__FRAMEWORKS := \
Cocoa \
Modified: openoffice/trunk/main/solenv/inc/unxlng.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxlng.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unxlng.mk (original)
+++ openoffice/trunk/main/solenv/inc/unxlng.mk Mon Nov 18 16:26:19 2013
@@ -39,7 +39,8 @@ JAVAFLAGSDEBUG=-g
#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
+CDEFS+=-DBOOST_DETAIL_NO_CONTAINER_FWD
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -226,24 +227,6 @@ X11LINK_DYNAMIC = -Wl,--as-needed -lXext
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-.IF "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlportstlg
-LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ENDIF
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
Modified: openoffice/trunk/main/solenv/inc/unxmacx.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxmacx.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unxmacx.mk (original)
+++ openoffice/trunk/main/solenv/inc/unxmacx.mk Mon Nov 18 16:26:19 2013
@@ -34,14 +34,9 @@ LINKOUTPUT_FILTER=
# Definitions that we may need on the compile line.
# -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when
# compiling STLport sources too, either internally or externally.
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -DSTLPORT_VERSION=$(STLPORT_VER) -D_USE_NAMESPACE=1
-.IF "$(GUIBASE)"=="unx" && "$(USE_SYSTEM_STL)"!="YES"
-CDEFS+=-DX_LOCALE
-.ENDIF
-.IF "$(GUIBASE)"=="aqua"
-# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
-# build can assume functions/libraries of that version to be available
-# unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -D_USE_NAMESPACE=1
+
+# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build result
# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
# http://developer.apple.com/technotes/tn2002/tn2064.html
# done in setsolar/configure now. left here for documentation
Modified: openoffice/trunk/main/solenv/inc/wntmsci11.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/wntmsci11.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/wntmsci11.mk (original)
+++ openoffice/trunk/main/solenv/inc/wntmsci11.mk Mon Nov 18 16:26:19 2013
@@ -219,7 +219,7 @@ CFLAGSWERRCC=-WX
MODULES_WITH_WARNINGS := \
soldep
-CDEFS+=-DSTLPORT_VERSION=400 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
+CDEFS+=-D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
.IF "$(COMEX)" == "11"
_VC_MANIFEST_BASENAME=__VC80
.ELSE
Modified: openoffice/trunk/main/stlport/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/stlport/makefile.mk?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/stlport/makefile.mk (original)
+++ openoffice/trunk/main/stlport/makefile.mk Mon Nov 18 16:26:19 2013
@@ -30,17 +30,7 @@ TARGET=so_stlport
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)"=="YES"
-
-.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
-# System STL when building with SunStudio is just a version of STLport
-# which comes with the compiler
-all:
- @echo "Nothing to do"
-.ELSE #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
-#
-# If you choose to build without stlport, some headers will be used to bring the
-# sgi extensions into the std namespace:
+# Wrap STL headers to get them into the std namespace:
$(INCCOM)$/stlport$/functional \
$(INCCOM)$/stlport$/hash_map \
$(INCCOM)$/stlport$/hash_set \
@@ -52,156 +42,4 @@ $(INCCOM)$/stlport$/set \
$(INCCOM)$/stlport$/vector: systemstl$/$$(@:f)
$(MKDIRHIER) $(@:d)
$(COPY) $< $@
-.ENDIF #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
-
-.ELSE # "$(USE_SYSTEM_STL)"
-
-# --- Files --------------------------------------------------------
-.EXPORT : CC CXX
-.IF "$(COMID)"=="gcc3"
- TARFILE_NAME=STLport-4.5
- TARFILE_MD5=18f577b374d60b3c760a3a3350407632
- PATCH_FILES=STLport-4.5.patch STLport-4.5-gcc43_warnings.patch
-.ELIF "$(GUI)"=="WNT"
- TARFILE_NAME=STLport-4.5-0119
- TARFILE_MD5=7376930b0d3f3d77a685d94c4a3acda8
- PATCH_FILES=STLport-4.5-0119.patch
-.ELSE
- TARFILE_NAME=STLport-4.0
- TARFILE_MD5=c441926f3a552ed3e5b274b62e86af16
- PATCH_FILES=STLport-4.0.patch STLport-4.0-sunstudio12u1.patch
- # To disable warnings from within STLport headers on unxsoli4 and
- # unxsols4, STLport-4.0.patch had to be extended mechanically by
- #
- # cd unxsol.../misc/build/STLport-4.0/stlport && \
- # find . -type f -exec sed -i \
- # -e 's/^\([ \t]*__STL_BEGIN_NAMESPACE[ \t]*\)$/#if defined \
- # __SUNPRO_CC\n#pragma disable_warn\n#endif\n&/' \
- # -e 's/^\([ \t]*__STL_END_NAMESPACE[ \t]*\)$/&\n#if defined \
- # __SUNPRO_CC\n#pragma enable_warn\n#endif/' {} \;
- #
- # (causing lots of files to become modified) and by additionally
- # changing unxsol.../misc/build/STLport-4.0/stlport/math.h,
- # unxsol.../misc/build/STLport-4.0/stlport/stl/_config.h,
- # unxsol.../misc/build/STLport-4.0/stlport/stl/_list.h, and
- # unxsol.../misc/build/STLport-4.0/stlport/stl/type_traits.h manually.
- # (Obviously due to the way the C++ compiler generates code for
- # instantiations of inline function templates from STLport headers, it
- # does not work to simply add "#pragma disable_warn" to stl/_prolog.h
- # and "#pragma enable_warn" to stl/_epilog.h, as seemingly some internal
- # STLport headers are read in by the compiler only at the end of a
- # compilation unit, outside the scope of stl/_prolog.h and
- # stl/_epilog.h.)
-.ENDIF
-
-ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak \
- src$/gcc-3.0-os2.mak src$/gcc-3.0-os2.def src$/common_macros_os2.mak
-
-
-CONFIGURE_ACTION=none
-CONFIGURE_FLAGS=
-
-BUILD_DIR=src
-
-.IF "$(COM)"=="MSC"
-BUILD_ACTION=nmake
-BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER)
-.ENDIF
-
-.IF "$(COM)"=="GCC"
- .IF "$(COMID)"=="gcc3"
- # FreeBSD needs a special makefile
- .IF "$(OS)"=="FREEBSD"
- BUILD_FLAGS=-f gcc-3.0-freebsd.mak
- .ELIF "$(OS)"=="OS2"
- BUILD_FLAGS=-f gcc-3.0-os2.mak
- .ELIF "$(GUI)"=="WNT"
- BUILD_FLAGS=-f gcc-3.0-mingw.mak
- .ELSE
- BUILD_FLAGS=-f gcc-3.0.mak
- .ENDIF
- .ELSE # "$(COMID)"=="gcc3"
- .IF "$(OS)"=="FREEBSD"
- BUILD_FLAGS=-f gcc-freebsd.mak
- .ELSE
- BUILD_FLAGS=-f gcc.mak
- .ENDIF
- .ENDIF # "$(COMID)"=="gcc3"
- BUILD_ACTION=$(GNUMAKE)
- # build in parallel
- BUILD_FLAGS+= -j$(MAXPROCESS)
-.ENDIF
-.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE"
-CXX+= -Wl,--hash-style=both
-.ENDIF
-
-.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
-CXX+= -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
-.ENDIF
-
-.IF "$(COM)"=="C52"
-BUILD_ACTION=make
-.IF "$(CCNUMVER)">="00050008"
-BUILD_FLAGS=-f sunpro11.mak
-.ELIF "$(CCNUMVER)">="00050005"
-BUILD_FLAGS=-f sunpro8.mak
-.ELSE
-BUILD_FLAGS=-f sunpro6.mak
-.ENDIF # "$(CCNUMVER)">="00050008"
-
-OUT2INC= \
- stlport$/SC5$/*.SUNWCCh
-.ENDIF
-
-OUTDIR2INC= \
- stlport
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-
-OUT2LIB= \
- lib$/lib*_static.a
-
-OUT2BIN= \
- lib$/*.dll
-
-.ELSE
-
-OUT2LIB= \
- lib$/*.lib
-
-OUT2BIN= \
- lib$/*.dll \
- lib$/*.pdb
-
-.ENDIF # "$(COM)"=="GCC"
-
-.ELIF "$(GUI)"=="OS2"
-
-OUT2LIB= lib$/*.lib
-OUT2BIN= lib$/*.dll
-
-.ELSE # "$(GUI)"=="WNT"
-
-OUT2LIB= \
- lib$/lib*
-
-.ENDIF # "$(GUI)"=="WNT"
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(STLPORT4)"!="NO_STLPORT4"
-all :
- @echo " An already available installation of STLport has been chosen in the configure process."
- @echo " Therefore the version provided here does not need to be built in addition."
-.ELIF "$(OS)"=="MACOSX"
-all:
- @echo '--with-stlport=yes is not supported on Mac OS X'
- false
-.ENDIF
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-.ENDIF # "$(USE_SYSTEM_STL)"
Modified: openoffice/trunk/main/stlport/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/stlport/prj/d.lst?rev=1543067&r1=1543066&r2=1543067&view=diff
==============================================================================
--- openoffice/trunk/main/stlport/prj/d.lst (original)
+++ openoffice/trunk/main/stlport/prj/d.lst Mon Nov 18 16:26:19 2013
@@ -1,25 +1,4 @@
mkdir: %_DEST%\inc%_EXT%\stl
-mkdir: %_DEST%\inc%_EXT%\stl\stl
-mkdir: %_DEST%\inc%_EXT%\stl\stl\debug
-mkdir: %_DEST%\inc%_EXT%\stl\stl\wrappers
-mkdir: %_DEST%\inc%_EXT%\stl\config
-mkdir: %_DEST%\inc%_EXT%\stl\using
-mkdir: %_DEST%\inc%_EXT%\stl\using\h
-mkdir: %_DEST%\inc%_EXT%\stl\wrap_std
-mkdir: %_DEST%\inc%_EXT%\stl\wrap_std\h
-..\%__SRC%\inc\*.SUNWCCH %_DEST%\inc%_EXT%\stl\*
..\%__SRC%\inc\stlport\* %_DEST%\inc%_EXT%\stl\*
-..\%__SRC%\inc\stlport\stl\* %_DEST%\inc%_EXT%\stl\stl\*
-..\%__SRC%\inc\stlport\stl\debug\* %_DEST%\inc%_EXT%\stl\stl\debug\*
-..\%__SRC%\inc\stlport\stl\wrappers\* %_DEST%\inc%_EXT%\stl\stl\wrappers\*
-..\%__SRC%\inc\stlport\config\* %_DEST%\inc%_EXT%\stl\config\*
-..\%__SRC%\inc\stlport\using\* %_DEST%\inc%_EXT%\stl\using\*
-..\%__SRC%\inc\stlport\using\h\* %_DEST%\inc%_EXT%\stl\using\h\*
-..\%__SRC%\inc\stlport\wrap_std\* %_DEST%\inc%_EXT%\stl\wrap_std\*
-..\%__SRC%\inc\stlport\wrap_std\h\* %_DEST%\inc%_EXT%\stl\wrap_std\h\*
..\systemstlguards\*.h %_DEST%\inc%_EXT%\stl\*.h
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll