diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2012-07-07 01:22:59 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-12-10 14:46:49 +0100 |
commit | caa75df6e832382191fa15bcc0a5002c4123cc61 (patch) | |
tree | 9d6b1fc7344b5d8b92a1c09cc4aae8460b63ca9d | |
parent | eb7ae5fe2a43e2022afd5670dd1c2fe1f7cce481 (diff) |
remove unneeded PCH stuff
Since the PCH is now explicitly included using the command line, it is no
longer necessary to have include guards or #ifdefs for enabling it.
Change-Id: Ie64fdc75129af7097213d86f2daec461993fb6f4
-rw-r--r-- | connectivity/inc/pch/precompiled_file.hxx | 9 | ||||
-rw-r--r-- | connectivity/inc/pch/precompiled_flat.hxx | 9 | ||||
-rw-r--r-- | sal/inc/pch/precompiled_sal.hxx | 10 | ||||
-rw-r--r-- | solenv/gbuild/LinkTarget.mk | 3 | ||||
-rw-r--r-- | writerfilter/inc/pch/precompiled_writerfilter.hxx | 9 | ||||
-rw-r--r-- | xmloff/inc/pch/precompiled_xmloff.hxx | 9 |
6 files changed, 0 insertions, 49 deletions
diff --git a/connectivity/inc/pch/precompiled_file.hxx b/connectivity/inc/pch/precompiled_file.hxx index ba902073deb2..fd9b58e35dfd 100644 --- a/connectivity/inc/pch/precompiled_file.hxx +++ b/connectivity/inc/pch/precompiled_file.hxx @@ -7,11 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef PRECOMPILED_FILE_HXX -#define PRECOMPILED_FILE_HXX - -#ifdef PRECOMPILED_HEADERS - #include <vector> #include <map> #include <list> @@ -33,8 +28,4 @@ #include <boost/ptr_container/ptr_vector.hpp> #include <boost/bind.hpp> -#endif - -#endif // PRECOMPILED_FILE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/pch/precompiled_flat.hxx b/connectivity/inc/pch/precompiled_flat.hxx index 772f52fdf6f5..fd9b58e35dfd 100644 --- a/connectivity/inc/pch/precompiled_flat.hxx +++ b/connectivity/inc/pch/precompiled_flat.hxx @@ -7,11 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef PRECOMPILED_FLAT_HXX -#define PRECOMPILED_FLAT_HXX - -#ifdef PRECOMPILED_HEADERS - #include <vector> #include <map> #include <list> @@ -33,8 +28,4 @@ #include <boost/ptr_container/ptr_vector.hpp> #include <boost/bind.hpp> -#endif - -#endif // PRECOMPILED_FLAT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx index 56f5004ed550..939af83951e9 100644 --- a/sal/inc/pch/precompiled_sal.hxx +++ b/sal/inc/pch/precompiled_sal.hxx @@ -7,11 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef PRECOMPILED_SAL_HXX -#define PRECOMPILED_SAL_HXX - -#ifdef PRECOMPILED_HEADERS - #include <vector> #include <map> #include <list> @@ -31,9 +26,4 @@ #include <boost/ptr_container/ptr_vector.hpp> #include <boost/bind.hpp> -#endif - -#endif // PRECOMPILED_SAL_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index d16dc8375645..3ad4c5855b28 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1206,8 +1206,6 @@ $(call gb_LinkTarget_get_target,$(1)) : PCHOBJNOEX = $(call gb_NoexPrecompiledHe $(call gb_LinkTarget_get_target,$(1)) : PCHOBJS = $$(PCHOBJEX) $(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS -$(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(DEFS) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(T_CXXFLAGS) $(call gb_LinkTarget__get_cxxflags,$(1)) @@ -1217,7 +1215,6 @@ ifeq ($(gb_FULLDEPS),$(true)) $(call gb_NoexPrecompiledHeader_get_dep_target,$(3)) $(call gb_PrecompiledHeader_get_timestamp,$(1)) : $(call gb_PrecompiledHeader_get_target,$(3)) $(call gb_NoexPrecompiledHeader_get_timestamp,$(1)) : $(call gb_NoexPrecompiledHeader_get_target,$(3)) -$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(DEFS) $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(T_CXXFLAGS) $(call gb_LinkTarget__get_cxxflags,$(1)) endif diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx index 430620d79a75..4a1d4f422ae0 100644 --- a/writerfilter/inc/pch/precompiled_writerfilter.hxx +++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx @@ -7,11 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef PRECOMPILED_WRITERFILTER_HXX -#define PRECOMPILED_WRITERFILTER_HXX - -#ifdef PRECOMPILED_HEADERS - #include <iostream> #include <sstream> #include <vector> @@ -43,8 +38,4 @@ #include <boost/scoped_array.hpp> #include <boost/type.hpp> -#endif - -#endif // PRECOMPILED_WRITERFILTER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx index d3d32efa0a66..988155d9ba6e 100644 --- a/xmloff/inc/pch/precompiled_xmloff.hxx +++ b/xmloff/inc/pch/precompiled_xmloff.hxx @@ -16,8 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifdef PRECOMPILED_HEADERS - #include <iostream> #include <sstream> #include <vector> @@ -49,9 +47,6 @@ #include <boost/scoped_array.hpp> #include <boost/type.hpp> -#ifndef PRECOMPILED_XMLOFF_HXX -#define PRECOMPILED_XMLOFF_HXX - #if 1 //---MARKER--- #include "sal/config.h" @@ -1278,8 +1273,4 @@ #endif -#endif - -#endif // PRECOMPILED_XMLOFF_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |