summaryrefslogtreecommitdiff
path: root/stlport
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-04-05 11:46:53 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-04-05 14:44:22 +0100
commit6cc4906024d34bed7b73115eedecfc5f8c597f80 (patch)
treebd5e34400ed2bf79262af514690612c2e8e99957 /stlport
parent4620f155b5ec9805e6387b5fbb36f62500c3ce72 (diff)
can remove these now
Diffstat (limited to 'stlport')
-rw-r--r--stlport/systemstlguards/postextstl.h37
-rw-r--r--stlport/systemstlguards/preextstl.h77
2 files changed, 0 insertions, 114 deletions
diff --git a/stlport/systemstlguards/postextstl.h b/stlport/systemstlguards/postextstl.h
deleted file mode 100644
index 9c37a36d91b7..000000000000
--- a/stlport/systemstlguards/postextstl.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifdef std_was_redefined_as_stlport
-// put things back the way they were
-# define std std_was_redefined_as_stlport
-# undef _STLP_OUTERMOST_HEADER_ID
-// force config to be re-read
-# undef _STLP_NOTHROW_INHERENTLY
-# undef _STLP_CONFIG_H
-# include <stddef.h>
-#endif
diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
deleted file mode 100644
index 763f0dfa79f3..000000000000
--- a/stlport/systemstlguards/preextstl.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-//1. Force inclusion of a std:: using header to ensure the stlport define
-//of std as "stlport"
-#include <algorithm>
-#if defined(ADAPT_EXT_STL)
-//2. Force inclusion of stlport headers to get their stlport:: definitions
-# include <ostream>
-# include <istream>
-# include <fstream>
-# include <iostream>
-# include <sstream>
-# include <vector>
-# include <deque>
-# include <set>
-# include <list>
-# include <map>
-//3. Now force inclusion of native headers to get their std:: definitions
-# if defined(std)
-# define std_was_redefined_as_stlport std
-# undef std
-# define _STLP_OUTERMOST_HEADER_ID 0xdeadbeaf
-# if defined(_GNUC__)
-# pragma GCC visibility push(default)
-# endif
-# include _STLP_NATIVE_HEADER(exception_defines.h)
-# include _STLP_NATIVE_HEADER(limits)
-# include _STLP_NATIVE_HEADER(memory)
-# include _STLP_NATIVE_HEADER(exception)
-# include _STLP_NATIVE_HEADER(iosfwd)
-# include _STLP_NATIVE_HEADER(algorithm)
-# include _STLP_NATIVE_HEADER(string)
-# include _STLP_NATIVE_HEADER(streambuf)
-# include _STLP_NATIVE_HEADER(ios)
-# include _STLP_NATIVE_HEADER(locale)
-# include _STLP_NATIVE_HEADER(stdexcept)
-# include _STLP_NATIVE_HEADER(ostream)
-# include _STLP_NATIVE_HEADER(istream)
-# include _STLP_NATIVE_HEADER(iostream)
-# include _STLP_NATIVE_HEADER(sstream)
-# include _STLP_NATIVE_HEADER(vector)
-# include _STLP_NATIVE_HEADER(deque)
-# include _STLP_NATIVE_HEADER(set)
-# include _STLP_NATIVE_HEADER(list)
-# include _STLP_NATIVE_HEADER(map)
-# if defined(_GNUC__)
-# pragma GCC visibility pop
-# endif
-# endif
-#endif
-//ext_std resolves to the std that external c++ libs, e.g. Graphite were built
-//against regardless of whether that is stlport or system stl
-namespace ext_std = std;