diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-06 15:02:35 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-06 15:02:35 +0100 |
commit | a15f4939aeb22b3740067a44b490974af91a5dfb (patch) | |
tree | d9ab482bf1b6c4e680ca36211f85446348b074c1 | |
parent | c3ac9078a689f7b62f44937ca49d56f1bb82c333 (diff) |
removing the hash_map, hash_set and slist forwarding headers
-rw-r--r-- | stlport/makefile.mk | 4 | ||||
-rw-r--r-- | stlport/systemstl/hash_map | 91 | ||||
-rw-r--r-- | stlport/systemstl/hash_set | 62 | ||||
-rw-r--r-- | stlport/systemstl/slist | 46 |
4 files changed, 0 insertions, 203 deletions
diff --git a/stlport/makefile.mk b/stlport/makefile.mk index 532a5dd9917e..6608dc541e71 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -46,11 +46,7 @@ all: # If you choose to build without stlport, some headers will be used to bring the # sgi extensions into the std namespace: $(INCCOM)$/stlport$/functional \ -$(INCCOM)$/stlport$/hash_map \ -$(INCCOM)$/stlport$/hash_set \ $(INCCOM)$/stlport$/numeric \ -$(INCCOM)$/stlport$/slist \ -$(INCCOM)$/stlport$/rope \ $(INCCOM)$/stlport$/vector: systemstl$/$$(@:f) $(MKDIRHIER) $(@:d) $(COPY) $< $@ diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map deleted file mode 100644 index 8dfc514027e3..000000000000 --- a/stlport/systemstl/hash_map +++ /dev/null @@ -1,91 +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. - * - ************************************************************************/ - -#ifndef SYSTEM_STL_HASHMAP -#define SYSTEM_STL_HASHMAP - -#ifdef GCC - -# include <functional> - -# define _BACKWARD_BACKWARD_WARNING_H 1 -# include <ext/hash_map> -# undef _BACKWARD_BACKWARD_WARNING_H - -namespace __gnu_cxx -{ - template<> struct hash < std::string > - { - size_t operator()(const std::string & x) const - { - return hash< const char* >()(x.c_str()); - } - }; - - template<> struct hash< long long int > - { - size_t operator()(long long int __x) const - { - return __x; - } - }; - - template<> struct hash< unsigned long long int > - { - size_t operator()(unsigned long long int __x) const - { - return __x; - } - }; -} - -namespace std -{ -# ifndef __GXX_EXPERIMENTAL_CXX0X__ - using __gnu_cxx::hash; -# endif - using __gnu_cxx::hash_map; - using __gnu_cxx::hash_multimap; -} - -#else -#ifdef _MSC_VER -#define USE_MSVC_HASH_MAP -#include <../include/hash_map> -namespace std -{ - using namespace stdext; -} -#else -# error UNSUPPORTED COMPILER -#endif -#endif - - -#endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stlport/systemstl/hash_set b/stlport/systemstl/hash_set deleted file mode 100644 index 9704396da066..000000000000 --- a/stlport/systemstl/hash_set +++ /dev/null @@ -1,62 +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. - * - ************************************************************************/ - -#ifndef SYSTEM_STL_HASHSET -#define SYSTEM_STL_HASHSET - -#ifdef GCC - -# include <functional> - -# define _BACKWARD_BACKWARD_WARNING_H 1 -# include <ext/hash_set> -# undef _BACKWARD_BACKWARD_WARNING_H - -namespace std -{ -# ifndef __GXX_EXPERIMENTAL_CXX0X__ - using __gnu_cxx::hash; -# endif - using __gnu_cxx::hash_set; - using __gnu_cxx::hash_multiset; -} -#else -#ifdef _MSC_VER -#define USE_MSVC_HASH_SET -#include <../include/hash_set> -namespace std -{ - using namespace stdext; -} -#else -# error UNSUPPORTED COMPILER -#endif -#endif - -#endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stlport/systemstl/slist b/stlport/systemstl/slist deleted file mode 100644 index eb0df9b53583..000000000000 --- a/stlport/systemstl/slist +++ /dev/null @@ -1,46 +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. - * - ************************************************************************/ - -#ifndef SYSTEM_STL_SLIST -#define SYSTEM_STL_SLIST - -#ifdef GCC - -#include <ext/slist> - -namespace std -{ - using __gnu_cxx::slist; -} -#else -#error UNSUPPORTED COMPILER -#endif - - -#endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |