strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't use the dummy functional at all

Browse source
This commit is contained in:
Fridrich Štrba 2011-02-08 16:31:28 +01:00
parent a7903846cb
commit b9bb63b5c3
2 changed files with 0 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
stlport/makefile.mk
View file

@ -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)"

67
stlport/systemstl/functional
View file

@ -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: */