cleared the need of the non-standard numeric, rope and vector header
This commit is contained in:
parent
d856c71a7d
commit
ef2942e54d
4 changed files with 1 additions and 164 deletions
|
@ -45,9 +45,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$/numeric \
|
||||
$(INCCOM)$/stlport$/vector: systemstl$/$$(@:f)
|
||||
$(INCCOM)$/stlport$/functional: systemstl$/$$(@:f)
|
||||
$(MKDIRHIER) $(@:d)
|
||||
$(COPY) $< $@
|
||||
.ENDIF #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
|
||||
|
|
|
@ -1,58 +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_NUMERIC
|
||||
#define SYSTEM_STL_NUMERIC
|
||||
|
||||
#ifdef GCC
|
||||
# include <functional>
|
||||
# ifdef __MINGW32__
|
||||
# define _SYSTEM_STL_MAKE_HEADER(path,header) <path/header>
|
||||
# include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,numeric)
|
||||
# else
|
||||
# include <ext/../numeric>
|
||||
# endif
|
||||
# include <ext/numeric>
|
||||
|
||||
# ifndef __GXX_EXPERIMENTAL_CXX0X__
|
||||
namespace std
|
||||
{
|
||||
using __gnu_cxx::iota;
|
||||
}
|
||||
# endif
|
||||
|
||||
#else
|
||||
#ifdef _MSC_VER
|
||||
#include <../include/numeric>
|
||||
#else
|
||||
# error UNSUPPORTED COMPILER
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
@ -1,49 +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_ROPE
|
||||
#define SYSTEM_STL_ROPE
|
||||
|
||||
#include <functional>
|
||||
#include <numeric>
|
||||
|
||||
#ifdef GCC
|
||||
|
||||
#include <ext/rope>
|
||||
|
||||
namespace std
|
||||
{
|
||||
using __gnu_cxx::rope;
|
||||
}
|
||||
#else
|
||||
#error UNSUPPORTED COMPILER
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
@ -1,54 +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_VECTOR
|
||||
#define SYSTEM_STL_VECTOR
|
||||
|
||||
#ifdef GCC
|
||||
|
||||
#ifdef __MINGW32__
|
||||
# define _SYSTEM_STL_MAKE_HEADER(path,header) <path/header>
|
||||
# include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,vector)
|
||||
#else
|
||||
# include <ext/../vector>
|
||||
#endif
|
||||
|
||||
namespace std
|
||||
{
|
||||
typedef vector<bool, std::allocator<bool> > bit_vector;
|
||||
}
|
||||
|
||||
#else
|
||||
#ifdef _MSC_VER
|
||||
#include <../include/vector>
|
||||
#else
|
||||
#error UNSUPPORTED COMPILER
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
Loading…
Reference in a new issue