From 70063f62e7e93c52fdd4b4cba0aeedcacafacb60 Mon Sep 17 00:00:00 2001 From: Szymon Siwek Date: Tue, 19 Dec 2006 21:37:49 +0000 Subject: [PATCH] - fix for STLport-5.x.x allowing build with libstdc++-4.2.0 (streamsize namespace issue) Changed files: STLport-gcc420_dirty_hack.patch -> 1.1 --- STLport-gcc420_dirty_hack.patch | 203 ++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) create mode 100644 STLport-gcc420_dirty_hack.patch diff --git a/STLport-gcc420_dirty_hack.patch b/STLport-gcc420_dirty_hack.patch new file mode 100644 index 0000000..7828519 --- /dev/null +++ b/STLport-gcc420_dirty_hack.patch @@ -0,0 +1,203 @@ +--- STLport-5.1.0/stlport/ext/type_traits.h.orig 1970-01-01 00:00:00.000000000 +0000 ++++ STLport-5.1.0/stlport/ext/type_traits.h 2006-12-18 12:56:32.000000000 +0000 +@@ -0,0 +1,200 @@ ++// -*- C++ -*- ++ ++// Copyright (C) 2005, 2006 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library is free ++// software; you can redistribute it and/or modify it under the terms ++// of the GNU General Public License as published by the Free Software ++// Foundation; either version 2, or (at your option) any later ++// version. ++ ++// This library 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 ++// General Public License for more details. ++ ++// You should have received a copy of the GNU General Public License along ++// with this library; see the file COPYING. If not, write to the Free ++// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ++// USA. ++ ++// As a special exception, you may use this file as part of a free ++// software library without restriction. Specifically, if other files ++// instantiate templates or use macros or inline functions from this ++// file, or you compile this file and link it with other files to ++// produce an executable, this file does not by itself cause the ++// resulting executable to be covered by the GNU General Public ++// License. This exception does not however invalidate any other ++// reasons why the executable file might be covered by the GNU General ++// Public License. ++ ++/** @file ext/type_traits.h ++ * This file is a GNU extension to the Standard C++ Library. ++ */ ++ ++#ifndef _EXT_TYPE_TRAITS ++#define _EXT_TYPE_TRAITS 1 ++ ++#pragma GCC system_header ++ ++#include ++#include ++#include ++#include // std::streamsize ++#include ++ ++_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) ++ ++ // Define a nested type if some predicate holds. ++ template ++ struct __enable_if ++ { }; ++ ++ template ++ struct __enable_if ++ { typedef _Tp __type; }; ++ ++ ++ // Conditional expression for types. If true, first, if false, second. ++ template ++ struct __conditional_type ++ { typedef _Iftrue __type; }; ++ ++ template ++ struct __conditional_type ++ { typedef _Iffalse __type; }; ++ ++ ++ // Given an integral builtin type, return the corresponding unsigned type. ++ template ++ struct __add_unsigned ++ { ++ private: ++ typedef __enable_if::__value, _Tp> __if_type; ++ ++ public: ++ typedef typename __if_type::__type __type; ++ }; ++ ++ template<> ++ struct __add_unsigned ++ { typedef unsigned char __type; }; ++ ++ template<> ++ struct __add_unsigned ++ { typedef unsigned char __type; }; ++ ++ template<> ++ struct __add_unsigned ++ { typedef unsigned short __type; }; ++ ++ template<> ++ struct __add_unsigned ++ { typedef unsigned int __type; }; ++ ++ template<> ++ struct __add_unsigned ++ { typedef unsigned long __type; }; ++ ++ template<> ++ struct __add_unsigned ++ { typedef unsigned long long __type; }; ++ ++ // Declare but don't define. ++ template<> ++ struct __add_unsigned; ++ ++ template<> ++ struct __add_unsigned; ++ ++ ++ // Given an integral builtin type, return the corresponding signed type. ++ template ++ struct __remove_unsigned ++ { ++ private: ++ typedef __enable_if::__value, _Tp> __if_type; ++ ++ public: ++ typedef typename __if_type::__type __type; ++ }; ++ ++ template<> ++ struct __remove_unsigned ++ { typedef signed char __type; }; ++ ++ template<> ++ struct __remove_unsigned ++ { typedef signed char __type; }; ++ ++ template<> ++ struct __remove_unsigned ++ { typedef short __type; }; ++ ++ template<> ++ struct __remove_unsigned ++ { typedef int __type; }; ++ ++ template<> ++ struct __remove_unsigned ++ { typedef long __type; }; ++ ++ template<> ++ struct __remove_unsigned ++ { typedef long long __type; }; ++ ++ // Declare but don't define. ++ template<> ++ struct __remove_unsigned; ++ ++ template<> ++ struct __remove_unsigned; ++ ++ ++ // Compile time constants for builtin types. ++ // Sadly std::numeric_limits member functions cannot be used for this. ++#define __glibcxx_signed(_Tp) ((_Tp)(-1) < 0) ++#define __glibcxx_digits(_Tp) \ ++ (sizeof(_Tp) * __CHAR_BIT__ - __glibcxx_signed(_Tp)) ++ ++#define __glibcxx_min(_Tp) \ ++ (__glibcxx_signed(_Tp) ? (_Tp)1 << __glibcxx_digits(_Tp) : (_Tp)0) ++ ++#define __glibcxx_max(_Tp) \ ++ (__glibcxx_signed(_Tp) ? ((_Tp)1 << __glibcxx_digits(_Tp)) - 1 : ~(_Tp)0) ++ ++ template ++ struct __numeric_traits_integer ++ { ++ // Only integers for initialization of member constant. ++ static const _Value __min = __glibcxx_min(_Value); ++ static const _Value __max = __glibcxx_max(_Value); ++ }; ++ ++ template ++ const _Value __numeric_traits_integer<_Value>::__min; ++ ++ template ++ const _Value __numeric_traits_integer<_Value>::__max; ++ ++ template ++ struct __numeric_traits_floating ++ { ++ // Only floating point types. See N1822. ++ static const _STLP_STD::streamsize __max_digits10 = ++ 2 + _STLP_STD::numeric_limits<_Value>::digits * 3010/10000; ++ }; ++ ++ template ++ const _STLP_STD::streamsize __numeric_traits_floating<_Value>::__max_digits10; ++ ++ template ++ struct __numeric_traits ++ : public __conditional_type::__value, ++ __numeric_traits_integer<_Value>, ++ __numeric_traits_floating<_Value> >::__type ++ { }; ++ ++_GLIBCXX_END_NAMESPACE ++ ++#endif -- 2.44.0