From 41b715c98980fb74858ed2e337a152c22de3927b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 31 Jan 2026 22:10:20 +0900 Subject: Remove support for Irix, which is discontinued and does not provide a c++17 complaint compiler. Signed-off-by: Michele Calgaro --- akregator/src/mk4storage/metakit/include/mk4.h | 9 -- indexlib/boost-compat/config/auto_link.h | 8 +- .../boost-compat/config/compiler/sgi_mipspro.h | 24 ----- indexlib/boost-compat/config/platform/irix.h | 31 ------ indexlib/boost-compat/config/requires_threads.h | 17 ---- .../boost-compat/config/select_compiler_config.h | 4 - .../boost-compat/config/select_platform_config.h | 4 - .../boost-compat/config/select_stdlib_config.h | 6 +- indexlib/boost-compat/config/stdlib/libcomo.h | 8 -- indexlib/boost-compat/config/stdlib/sgi.h | 111 --------------------- indexlib/boost-compat/config/stdlib/stlport.h | 14 ++- indexlib/boost-compat/intrusive_ptr.h | 2 +- indexlib/boost-compat/shared_ptr.h | 2 +- mimelib/mimelib/config.h | 2 +- tderesources/groupwise/soap/stdsoap2.h | 2 +- 15 files changed, 15 insertions(+), 229 deletions(-) delete mode 100644 indexlib/boost-compat/config/compiler/sgi_mipspro.h delete mode 100644 indexlib/boost-compat/config/platform/irix.h delete mode 100644 indexlib/boost-compat/config/stdlib/sgi.h diff --git a/akregator/src/mk4storage/metakit/include/mk4.h b/akregator/src/mk4storage/metakit/include/mk4.h index 81c28999..eaa8700d 100644 --- a/akregator/src/mk4storage/metakit/include/mk4.h +++ b/akregator/src/mk4storage/metakit/include/mk4.h @@ -114,15 +114,6 @@ //--------------------------------------------------------------------------- - // IRIX supports the bool datatype - // define before gcc to cover both the gcc and MipsPRO compiler -#if defined (sgi) -#define q4_BOOL 1 -#undef bool -#undef true -#undef false -#endif - // GNU gcc/egcs #if defined (__GNUC__) #ifndef q4_BOOL diff --git a/indexlib/boost-compat/config/auto_link.h b/indexlib/boost-compat/config/auto_link.h index e3bdc41d..c0df7e83 100644 --- a/indexlib/boost-compat/config/auto_link.h +++ b/indexlib/boost-compat/config/auto_link.h @@ -143,7 +143,7 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. # ifdef _DLL -# if (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)) && (defined(_STLP_OWN_IOSTREAMS) || defined(__STL_OWN_IOSTREAMS)) +# if defined(_STLPORT_VERSION) && (defined(_STLP_OWN_IOSTREAMS) || defined(__STL_OWN_IOSTREAMS)) # if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) # define BOOST_LIB_RT_OPT "-gdp" @@ -155,7 +155,7 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. # define BOOST_LIB_RT_OPT "-p" # endif -# elif defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) +# elif defined(_STLPORT_VERSION) # if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) # define BOOST_LIB_RT_OPT "-gdpn" @@ -179,7 +179,7 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. # else -# if (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)) && (defined(_STLP_OWN_IOSTREAMS) || defined(__STL_OWN_IOSTREAMS)) +# if defined(_STLPORT_VERSION) && (defined(_STLP_OWN_IOSTREAMS) || defined(__STL_OWN_IOSTREAMS)) # if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) # define BOOST_LIB_RT_OPT "-sgdp" @@ -191,7 +191,7 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. # define BOOST_LIB_RT_OPT "-sp" # endif -# elif defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) +# elif defined(_STLPORT_VERSION) # if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) # define BOOST_LIB_RT_OPT "-sgdpn" diff --git a/indexlib/boost-compat/config/compiler/sgi_mipspro.h b/indexlib/boost-compat/config/compiler/sgi_mipspro.h deleted file mode 100644 index 689b67ee..00000000 --- a/indexlib/boost-compat/config/compiler/sgi_mipspro.h +++ /dev/null @@ -1,24 +0,0 @@ -// (C) Copyright John Maddock 2001 - 2002. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org for most recent version. - -// SGI C++ compiler setup: - -#define BOOST_COMPILER "SGI Irix compiler version " BOOST_STRINGIZE(_COMPILER_VERSION) - -#include "boost/config/compiler/common_edg.hpp" - -// -// Threading support: -// Turn this on unconditionally here, it will get turned off again later -// if no threading API is detected. -// -#define BOOST_HAS_THREADS -// -// version check: -// probably nothing to do here? - - diff --git a/indexlib/boost-compat/config/platform/irix.h b/indexlib/boost-compat/config/platform/irix.h deleted file mode 100644 index aeae49c8..00000000 --- a/indexlib/boost-compat/config/platform/irix.h +++ /dev/null @@ -1,31 +0,0 @@ -// (C) Copyright John Maddock 2001 - 2003. -// (C) Copyright Jens Maurer 2003. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - - -// See http://www.boost.org for most recent version. - -// SGI Irix specific config options: - -#define BOOST_PLATFORM "SGI Irix" - -#define BOOST_NO_SWPRINTF -// -// these are not auto detected by POSIX feature tests: -// -#define BOOST_HAS_GETTIMEOFDAY -#define BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE - -#ifdef __GNUC__ - // GNU C on IRIX does not support threads (checked up to gcc 3.3) -# define BOOST_DISABLE_THREADS -#endif - -// boilerplate code: -#define BOOST_HAS_UNISTD_H -#include - - - diff --git a/indexlib/boost-compat/config/requires_threads.h b/indexlib/boost-compat/config/requires_threads.h index b405c237..cf51662c 100644 --- a/indexlib/boost-compat/config/requires_threads.h +++ b/indexlib/boost-compat/config/requires_threads.h @@ -13,19 +13,6 @@ #if defined(BOOST_DISABLE_THREADS) -// -// special case to handle versions of gcc which don't currently support threads: -// -#if defined(__GNUC__) && ((__GNUC__ < 3) || (__GNUC_MINOR__ <= 3) || !defined(BOOST_STRICT_CONFIG)) -// -// this is checked up to gcc 3.3: -// -#if defined(__sgi) -# error "Multi-threaded programs are not supported by gcc on Irix (last checked with gcc 3.3)" -#endif - -#endif - # error "Threading support unavaliable: it has been explicitly disabled with BOOST_DISABLE_THREADS" #elif !defined(BOOST_HAS_THREADS) @@ -46,10 +33,6 @@ // GNU C++: # error "Compiler threading support is not turned on. Please set the correct command line options for threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)" -#elif defined __sgi -// SGI MIPSpro C++ -# error "Compiler threading support is not turned on. Please set the correct command line options for threading: -D_SGI_MP_SOURCE" - #elif defined __SUNPRO_CC // Sun Workshop Compiler C++ # error "Compiler threading support is not turned on. Please set the correct command line options for threading: -mt" diff --git a/indexlib/boost-compat/config/select_compiler_config.h b/indexlib/boost-compat/config/select_compiler_config.h index f8f93a07..6f79b559 100644 --- a/indexlib/boost-compat/config/select_compiler_config.h +++ b/indexlib/boost-compat/config/select_compiler_config.h @@ -32,10 +32,6 @@ // Kai C++ # define BOOST_COMPILER_CONFIG "boost/config/compiler/kai.hpp" -#elif defined __sgi -// SGI MIPSpro C++ -# define BOOST_COMPILER_CONFIG "boost/config/compiler/sgi_mipspro.hpp" - #elif defined __ghs // Greenhills C++ # define BOOST_COMPILER_CONFIG "boost/config/compiler/greenhills.hpp" diff --git a/indexlib/boost-compat/config/select_platform_config.h b/indexlib/boost-compat/config/select_platform_config.h index 18c5b7b0..c4783929 100644 --- a/indexlib/boost-compat/config/select_platform_config.h +++ b/indexlib/boost-compat/config/select_platform_config.h @@ -25,10 +25,6 @@ // solaris: # define BOOST_PLATFORM_CONFIG "boost/config/platform/solaris.hpp" -#elif defined(__sgi) -// SGI Irix: -# define BOOST_PLATFORM_CONFIG "boost/config/platform/irix.hpp" - #elif defined(__CYGWIN__) // cygwin is not win32: # define BOOST_PLATFORM_CONFIG "boost/config/platform/cygwin.hpp" diff --git a/indexlib/boost-compat/config/select_stdlib_config.h b/indexlib/boost-compat/config/select_stdlib_config.h index a061c5be..a962621b 100644 --- a/indexlib/boost-compat/config/select_stdlib_config.h +++ b/indexlib/boost-compat/config/select_stdlib_config.h @@ -19,7 +19,7 @@ #include -#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) +#if defined(_STLPORT_VERSION) // STLPort library; this _must_ come first, otherwise since // STLport typically sits on top of some other library, we // can end up detecting that first rather than STLport: @@ -37,10 +37,6 @@ // GNU libstdc++ 3 # define BOOST_STDLIB_CONFIG "boost/config/stdlib/libstdcpp3.hpp" -#elif defined(__STL_CONFIG_H) -// generic SGI STL -# define BOOST_STDLIB_CONFIG "boost/config/stdlib/sgi.hpp" - #elif defined(__IBMCPP__) // take the default VACPP std lib # define BOOST_STDLIB_CONFIG "boost/config/stdlib/vacpp.hpp" diff --git a/indexlib/boost-compat/config/stdlib/libcomo.h b/indexlib/boost-compat/config/stdlib/libcomo.h index b2c8e440..d4148d84 100644 --- a/indexlib/boost-compat/config/stdlib/libcomo.h +++ b/indexlib/boost-compat/config/stdlib/libcomo.h @@ -33,14 +33,6 @@ # define BOOST_HAS_SLIST #endif -// -// Intrinsic type_traits support. -// The SGI STL has it's own __type_traits class, which -// has intrinsic compiler support with SGI's compilers. -// Whatever map SGI style type traits to boost equivalents: -// -#define BOOST_HAS_SGI_TYPE_TRAITS - #define BOOST_STDLIB "Comeau standard library " BOOST_STRINGIZE(__LIBCOMO_VERSION__) diff --git a/indexlib/boost-compat/config/stdlib/sgi.h b/indexlib/boost-compat/config/stdlib/sgi.h deleted file mode 100644 index 67f7a0a4..00000000 --- a/indexlib/boost-compat/config/stdlib/sgi.h +++ /dev/null @@ -1,111 +0,0 @@ -// (C) Copyright John Maddock 2001 - 2003. -// (C) Copyright Darin Adler 2001. -// (C) Copyright Jens Maurer 2001 - 2003. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org for most recent version. - -// generic SGI STL: - -#if !defined(__STL_CONFIG_H) -# include -# if !defined(__STL_CONFIG_H) -# error "This is not the SGI STL!" -# endif -#endif - -// -// No std::iterator traits without partial specialisation: -// -#if !defined(__STL_CLASS_PARTIAL_SPECIALIZATION) -# define BOOST_NO_STD_ITERATOR_TRAITS -#endif - -// -// No std::stringstream with gcc < 3 -// -#if defined(__GNUC__) && (__GNUC__ < 3) && \ - ((__GNUC_MINOR__ < 95) || (__GNUC_MINOR__ == 96)) && \ - !defined(__STL_USE_NEW_IOSTREAMS) || \ - defined(__APPLE_CC__) - // Note that we only set this for GNU C++ prior to 2.95 since the - // latest patches for that release do contain a minimal - // If you are running a 2.95 release prior to 2.95.3 then this will need - // setting, but there is no way to detect that automatically (other - // than by running the configure script). - // Also, the unofficial GNU C++ 2.96 included in RedHat 7.1 doesn't - // have . -# define BOOST_NO_STRINGSTREAM -#endif - -// -// Assume no std::locale without own iostreams (this may be an -// incorrect assumption in some cases): -// -#if !defined(__SGI_STL_OWN_IOSTREAMS) && !defined(__STL_USE_NEW_IOSTREAMS) -# define BOOST_NO_STD_LOCALE -#endif - -// -// Original native SGI streams have non-standard std::messages facet: -// -#if defined(__sgi) && (_COMPILER_VERSION <= 650) && !defined(__SGI_STL_OWN_IOSTREAMS) -# define BOOST_NO_STD_LOCALE -#endif - -// -// SGI's new iostreams have missing "const" in messages<>::open -// -#if defined(__sgi) && (_COMPILER_VERSION <= 740) && defined(__STL_USE_NEW_IOSTREAMS) -# define BOOST_NO_STD_MESSAGES -#endif - -// -// No template iterator constructors, or std::allocator -// without member templates: -// -#if !defined(__STL_MEMBER_TEMPLATES) -# define BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS -# define BOOST_NO_STD_ALLOCATOR -#endif - -// -// We always have SGI style hash_set, hash_map, and slist: -// -#define BOOST_HAS_HASH -#define BOOST_HAS_SLIST - -// -// If this is GNU libstdc++2, then no and no std::wstring: -// -#if (defined(__GNUC__) && (__GNUC__ < 3)) -# include -# if defined(__BASTRING__) -# define BOOST_NO_LIMITS -// Note: will provide compile-time constants -# undef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS -# define BOOST_NO_STD_WSTRING -# endif -#endif - -// -// There is no standard iterator unless we have namespace support: -// -#if !defined(__STL_USE_NAMESPACES) -# define BOOST_NO_STD_ITERATOR -#endif - -// -// Intrinsic type_traits support. -// The SGI STL has it's own __type_traits class, which -// has intrinsic compiler support with SGI's compilers. -// Whatever map SGI style type traits to boost equivalents: -// -#define BOOST_HAS_SGI_TYPE_TRAITS - -#define BOOST_STDLIB "SGI standard library" - - - diff --git a/indexlib/boost-compat/config/stdlib/stlport.h b/indexlib/boost-compat/config/stdlib/stlport.h index 8bc5c1d0..d48a3a2d 100644 --- a/indexlib/boost-compat/config/stdlib/stlport.h +++ b/indexlib/boost-compat/config/stdlib/stlport.h @@ -9,9 +9,9 @@ // STLPort standard library config: -#if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION) +#if !defined(_STLPORT_VERSION) # include -# if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION) +# if !defined(_STLPORT_VERSION) # error "This is not STLPort!" # endif #endif @@ -20,7 +20,7 @@ // __STL_STATIC_CONST_INIT_BUG implies BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS // for versions prior to 4.1(beta) // -#if (defined(__STL_STATIC_CONST_INIT_BUG) || defined(_STLP_STATIC_CONST_INIT_BUG)) && (__SGI_STL_PORT <= 0x400) +#if (defined(__STL_STATIC_CONST_INIT_BUG) || defined(_STLP_STATIC_CONST_INIT_BUG)) # define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS #endif @@ -35,7 +35,7 @@ // // No new style iostreams on GCC without STLport's iostreams enabled: // -#if (defined(__GNUC__) && (__GNUC__ < 3)) && !(defined(__SGI_STL_OWN_IOSTREAMS) || defined(_STLP_OWN_IOSTREAMS)) +#if (defined(__GNUC__) && (__GNUC__ < 3)) && !defined(_STLP_OWN_IOSTREAMS) # define BOOST_NO_STRINGSTREAM #endif @@ -56,7 +56,7 @@ # define BOOST_NO_STD_LOCALE # endif #else -# if !defined(__SGI_STL_OWN_IOSTREAMS) && defined(__STL_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) +# if defined(__STL_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) # define BOOST_NO_STD_LOCALE # endif #endif @@ -96,7 +96,7 @@ #endif // -// We always have SGI style hash_set, hash_map, and slist: +// We always have hash_set, hash_map, and slist: // #define BOOST_HAS_HASH #define BOOST_HAS_SLIST @@ -161,8 +161,6 @@ namespace boost { using std::min; using std::max; } #endif -#define BOOST_STDLIB "STLPort standard library version " BOOST_STRINGIZE(__SGI_STL_PORT) - diff --git a/indexlib/boost-compat/intrusive_ptr.h b/indexlib/boost-compat/intrusive_ptr.h index a2af559b..9b162010 100644 --- a/indexlib/boost-compat/intrusive_ptr.h +++ b/indexlib/boost-compat/intrusive_ptr.h @@ -240,7 +240,7 @@ template std::ostream & operator<< (std::ostream & os, intrusive_ptr #else -# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, <= 1200 && __SGI_STL_PORT) +# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, <= 1200) // MSVC6 has problems finding std::basic_ostream through the using declaration in namespace _STL using std::basic_ostream; template basic_ostream & operator<< (basic_ostream & os, intrusive_ptr const & p) diff --git a/indexlib/boost-compat/shared_ptr.h b/indexlib/boost-compat/shared_ptr.h index a369dc0f..ed154f25 100644 --- a/indexlib/boost-compat/shared_ptr.h +++ b/indexlib/boost-compat/shared_ptr.h @@ -394,7 +394,7 @@ template std::ostream & operator<< (std::ostream & os, shared_ptr co #else -# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, <= 1200 && __SGI_STL_PORT) +# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, <= 1200) // MSVC6 has problems finding std::basic_ostream through the using declaration in namespace _STL using std::basic_ostream; template basic_ostream & operator<< (basic_ostream & os, shared_ptr const & p) diff --git a/mimelib/mimelib/config.h b/mimelib/mimelib/config.h index 9467d30d..785d5bd5 100644 --- a/mimelib/mimelib/config.h +++ b/mimelib/mimelib/config.h @@ -136,7 +136,7 @@ typedef bool DwBool; # define DW_STD_16_BIT #endif -#if defined(__alpha) || defined(__sgi) +#if defined(__alpha) # define DW_STD_64_BIT #endif diff --git a/tderesources/groupwise/soap/stdsoap2.h b/tderesources/groupwise/soap/stdsoap2.h index b48e28a8..5ca66961 100644 --- a/tderesources/groupwise/soap/stdsoap2.h +++ b/tderesources/groupwise/soap/stdsoap2.h @@ -491,7 +491,7 @@ extern "C" { # define SOAP_SOCKLEN_T SOCKLEN_T #elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__TQNX__) || defined(TQNX) || defined(_AIX) || defined(__NetBSD__) || defined(__DragonFly__) # define SOAP_SOCKLEN_T socklen_t -#elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(SUN_OS) || defined(OPENSERVER) || defined(VXWORKS) +#elif defined(WIN32) || defined(__APPLE__) || defined(SUN_OS) || defined(OPENSERVER) || defined(VXWORKS) # define SOAP_SOCKLEN_T int #else # define SOAP_SOCKLEN_T size_t -- cgit v1.2.3