From b9bb63b5c39ce5a8673826487d6908b1b3aad186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Tue, 8 Feb 2011 16:31:28 +0100
Subject: [PATCH] Don't use the dummy functional at all

---
 stlport/makefile.mk          | 11 ------
 stlport/systemstl/functional | 67 ------------------------------------
 2 files changed, 78 deletions(-)
 delete mode 100644 stlport/systemstl/functional

diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index 2803be6076ab..fa1de9438a21 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -36,19 +36,8 @@ TARGET=so_stlport
 
 .IF "$(USE_SYSTEM_STL)"=="YES"
 
-.IF ("$(OS)"=="SOLARIS" && "$(COM)"!="GCC") | ("$(OS)"=="WNT" && "$(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") | ("$(OS)"=="WNT" && "$(COM)"!="GCC")
-#
-# If you choose to build without stlport, some headers will be used to bring the
-# sgi extensions into the std namespace:
-$(INCCOM)$/stlport$/functional: systemstl$/$$(@:f)
-    $(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-.ENDIF #("$(OS)"=="SOLARIS" && "$(COM)"!="GCC") | ("$(OS)"=="WNT" && "$(COM)"!="GCC")
 
 .ELSE # "$(USE_SYSTEM_STL)"
 
diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional
deleted file mode 100644
index 2c555ba2573d..000000000000
--- a/stlport/systemstl/functional
+++ /dev/null
@@ -1,67 +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_FUNCTIONAL
-#define SYSTEM_STL_FUNCTIONAL
-
-#ifdef GCC
-# ifdef __MINGW32__
-#  define _SYSTEM_STL_MAKE_HEADER(path,header) <path/header>
-#  include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,functional)
-# else
-#  include <ext/../functional>
-# endif
-#  include <ext/functional>
-
-namespace std
-{
-	using __gnu_cxx::project1st;
-	using __gnu_cxx::project2nd;
-	using __gnu_cxx::select1st;
-	using __gnu_cxx::select2nd;
-	using __gnu_cxx::compose1;
-	using __gnu_cxx::compose2;
-	using __gnu_cxx::unary_compose;
-	using __gnu_cxx::binary_compose;
-# ifndef __GXX_EXPERIMENTAL_CXX0X__
-	using __gnu_cxx::identity;
-	using __gnu_cxx::mem_fun1;
-	using __gnu_cxx::mem_fun1_ref;
-# endif
-}
-
-#else
-#ifdef _MSC_VER
-#include <../include/functional>
-#else
-# error UNSUPPORTED COMPILER
-#endif
-#endif
-
-#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */