summaryrefslogtreecommitdiffstats
path: root/indexlib/boost-compat/config
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-12-31 11:24:44 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-12-31 23:45:25 +0900
commit68129f0f2daa7db91578b010a9f0ea6830766168 (patch)
tree2186b6f379b015bca3df03ce70fc2a11353ab746 /indexlib/boost-compat/config
parent69430d0f797046626c52c1bebf61737da7c97e2f (diff)
downloadtdepim-r14.1.x.tar.gz
tdepim-r14.1.x.zip
Remove support for Metrowerks compilerr14.1.x
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit cf77371af416089034949edd8aed088432a9adfb)
Diffstat (limited to 'indexlib/boost-compat/config')
-rw-r--r--indexlib/boost-compat/config/auto_link.h15
-rw-r--r--indexlib/boost-compat/config/compiler/metrowerks.h97
-rw-r--r--indexlib/boost-compat/config/requires_threads.h7
-rw-r--r--indexlib/boost-compat/config/select_compiler_config.h7
-rw-r--r--indexlib/boost-compat/config/select_stdlib_config.h4
-rw-r--r--indexlib/boost-compat/config/stdlib/msl.h54
6 files changed, 4 insertions, 180 deletions
diff --git a/indexlib/boost-compat/config/auto_link.h b/indexlib/boost-compat/config/auto_link.h
index 96ada7aa8..e3bdc41db 100644
--- a/indexlib/boost-compat/config/auto_link.h
+++ b/indexlib/boost-compat/config/auto_link.h
@@ -70,7 +70,7 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
# ifndef BOOST_CONFIG_H
# include <boost/config.hpp>
# endif
-#elif defined(_MSC_VER) && !defined(__MWERKS__) && !defined(__EDG_VERSION__)
+#elif defined(_MSC_VER) && !defined(__EDG_VERSION__)
//
// C language compatability (no, honestly)
//
@@ -82,7 +82,6 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
// Only include what follows for known and supported compilers:
//
#if defined(BOOST_MSVC) \
- || (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) \
|| (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200))
#ifndef BOOST_VERSION_H
@@ -129,16 +128,6 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
// Intel C++, no version number:
# define BOOST_LIB_TOOLSET "iw"
-#elif defined(__MWERKS__) && (__MWERKS__ <= 0x31FF )
-
- // Metrowerks CodeWarrior 8.x
-# define BOOST_LIB_TOOLSET "cw8"
-
-#elif defined(__MWERKS__) && (__MWERKS__ <= 0x32FF )
-
- // Metrowerks CodeWarrior 9.x
-# define BOOST_LIB_TOOLSET "cw9"
-
#endif
//
@@ -150,7 +139,7 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
# define BOOST_LIB_THREAD_OPT
#endif
-#if defined(_MSC_VER) || defined(__MWERKS__)
+#if defined(_MSC_VER)
# ifdef _DLL
diff --git a/indexlib/boost-compat/config/compiler/metrowerks.h b/indexlib/boost-compat/config/compiler/metrowerks.h
deleted file mode 100644
index a74cadef1..000000000
--- a/indexlib/boost-compat/config/compiler/metrowerks.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// (C) Copyright John Maddock 2001.
-// (C) Copyright Darin Adler 2001.
-// (C) Copyright Peter Dimov 2001.
-// (C) Copyright David Abrahams 2001 - 2002.
-// (C) Copyright Beman Dawes 2001 - 2003.
-// (C) Copyright Stefan Slapeta 2004.
-// 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.
-
-// Metrowerks C++ compiler setup:
-
-// locale support is disabled when linking with the dynamic runtime
-# ifdef _MSL_NO_LOCALE
-# define BOOST_NO_STD_LOCALE
-# endif
-
-# if __MWERKS__ <= 0x2301 // 5.3
-# define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-# define BOOST_NO_POINTER_TO_MEMBER_CONST
-# define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
-# define BOOST_NO_MEMBER_TEMPLATE_KEYWORD
-# endif
-
-# if __MWERKS__ <= 0x2401 // 6.2
-//# define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-# endif
-
-# if(__MWERKS__ <= 0x2407) // 7.x
-# define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
-# define BOOST_NO_UNREACHABLE_RETURN_DETECTION
-# endif
-
-# if(__MWERKS__ <= 0x3003) // 8.x
-# define BOOST_NO_SFINAE
-# endif
-
-# if(__MWERKS__ <= 0x3204) // 9.3
-# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-# endif
-
-#if !__option(wchar_type)
-# define BOOST_NO_INTRINSIC_WCHAR_T
-#endif
-
-#if !__option(exceptions)
-# define BOOST_NO_EXCEPTIONS
-#endif
-
-#if (__INTEL__ && _WIN32) || (__POWERPC__ && macintosh)
-# if __MWERKS__ == 0x3000
-# define BOOST_COMPILER_VERSION 8.0
-# elif __MWERKS__ == 0x3001
-# define BOOST_COMPILER_VERSION 8.1
-# elif __MWERKS__ == 0x3002
-# define BOOST_COMPILER_VERSION 8.2
-# elif __MWERKS__ == 0x3003
-# define BOOST_COMPILER_VERSION 8.3
-# elif __MWERKS__ == 0x3200
-# define BOOST_COMPILER_VERSION 9.0
-# elif __MWERKS__ == 0x3201
-# define BOOST_COMPILER_VERSION 9.1
-# elif __MWERKS__ == 0x3202
-# define BOOST_COMPILER_VERSION 9.2
-# elif __MWERKS__ == 0x3204
-# define BOOST_COMPILER_VERSION 9.3
-# else
-# define BOOST_COMPILER_VERSION __MWERKS__
-# endif
-#else
-# define BOOST_COMPILER_VERSION __MWERKS__
-#endif
-
-#define BOOST_COMPILER "Metrowerks CodeWarrior C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
-
-//
-// versions check:
-// we don't support Metrowerks prior to version 5.3:
-#if __MWERKS__ < 0x2301
-# error "Compiler not supported or configured - please reconfigure"
-#endif
-//
-// last known and checked version:
-#if (__MWERKS__ > 0x3204)
-# if defined(BOOST_ASSERT_CONFIG)
-# error "Unknown compiler version - please run the configure tests and report the results"
-# endif
-#endif
-
-
-
-
-
-
-
diff --git a/indexlib/boost-compat/config/requires_threads.h b/indexlib/boost-compat/config/requires_threads.h
index cc5b049c5..a8236b1f7 100644
--- a/indexlib/boost-compat/config/requires_threads.h
+++ b/indexlib/boost-compat/config/requires_threads.h
@@ -54,10 +54,6 @@
// Compaq Tru64 Unix cxx
# error "Compiler threading support is not turned on. Please set the correct command line options for threading: -pthread"
-#elif defined __MWERKS__
-// Metrowerks CodeWarrior
-# error "Compiler threading support is not turned on. Please set the correct command line options for threading: either -runtime sm, -runtime smd, -runtime dm, or -runtime dmd"
-
#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"
@@ -73,8 +69,7 @@
#elif defined _MSC_VER
// Microsoft Visual C++
//
-// Must remain the last #elif since some other vendors (Metrowerks, for
-// example) also #define _MSC_VER
+// Must remain the last #elif since some other vendors may also #define _MSC_VER
# error "Compiler threading support is not turned on. Please set the correct command line options for threading: either /MT /MTd /MD or /MDd"
#else
diff --git a/indexlib/boost-compat/config/select_compiler_config.h b/indexlib/boost-compat/config/select_compiler_config.h
index f3c28043b..7395aa026 100644
--- a/indexlib/boost-compat/config/select_compiler_config.h
+++ b/indexlib/boost-compat/config/select_compiler_config.h
@@ -44,10 +44,6 @@
// Greenhills C++
# define BOOST_COMPILER_CONFIG "boost/config/compiler/greenhills.hpp"
-#elif defined __MWERKS__
-// Metrowerks CodeWarrior
-# define BOOST_COMPILER_CONFIG "boost/config/compiler/metrowerks.hpp"
-
#elif defined __SUNPRO_CC
// Sun Workshop Compiler C++
# define BOOST_COMPILER_CONFIG "boost/config/compiler/sunpro_cc.hpp"
@@ -67,8 +63,7 @@
#elif defined _MSC_VER
// Microsoft Visual C++
//
-// Must remain the last #elif since some other vendors (Metrowerks, for
-// example) also #define _MSC_VER
+// Must remain the last #elif since some other vendors may also #define _MSC_VER
# define BOOST_COMPILER_CONFIG "boost/config/compiler/visualc.hpp"
#elif defined (BOOST_ASSERT_CONFIG)
diff --git a/indexlib/boost-compat/config/select_stdlib_config.h b/indexlib/boost-compat/config/select_stdlib_config.h
index b7bf59143..a061c5bee 100644
--- a/indexlib/boost-compat/config/select_stdlib_config.h
+++ b/indexlib/boost-compat/config/select_stdlib_config.h
@@ -41,10 +41,6 @@
// generic SGI STL
# define BOOST_STDLIB_CONFIG "boost/config/stdlib/sgi.hpp"
-#elif defined(__MSL_CPP__)
-// MSL standard lib:
-# define BOOST_STDLIB_CONFIG "boost/config/stdlib/msl.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/msl.h b/indexlib/boost-compat/config/stdlib/msl.h
deleted file mode 100644
index f8ad3d9ad..000000000
--- a/indexlib/boost-compat/config/stdlib/msl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// (C) Copyright John Maddock 2001.
-// (C) Copyright Darin Adler 2001.
-// 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.
-
-// Metrowerks standard library:
-
-#ifndef __MSL_CPP__
-# include <utility>
-# ifndef __MSL_CPP__
-# error This is not the MSL standard library!
-# endif
-#endif
-
-#if __MSL_CPP__ >= 0x6000 // Pro 6
-# define BOOST_HAS_HASH
-# define BOOST_STD_EXTENSION_NAMESPACE Metrowerks
-#endif
-#define BOOST_HAS_SLIST
-
-#if __MSL_CPP__ < 0x6209
-# define BOOST_NO_STD_MESSAGES
-#endif
-
-// check C lib version for <stdint.h>
-#include <cstddef>
-
-#if defined(__MSL__) && (__MSL__ >= 0x5000)
-# define BOOST_HAS_STDINT_H
-# if !defined(__PALMOS_TRAPS__)
-# define BOOST_HAS_UNISTD_H
-# endif
- // boilerplate code:
-# include <boost/config/posix_features.hpp>
-#endif
-
-#if defined(_MWMT) || _MSL_THREADSAFE
-# define BOOST_HAS_THREADS
-#endif
-
-
-#define BOOST_STDLIB "Metrowerks Standard Library version " BOOST_STRINGIZE(__MSL_CPP__)
-
-
-
-
-
-
-
-
-