diff options
22 files changed, 15 insertions, 759 deletions
diff --git a/akregator/src/mk4storage/metakit/README b/akregator/src/mk4storage/metakit/README index 9441806f7..5538acc03 100644 --- a/akregator/src/mk4storage/metakit/README +++ b/akregator/src/mk4storage/metakit/README @@ -55,9 +55,7 @@ INSTALLATION All platform builds and language bindings are designed to work from a single common "builds/" directory. Where possible, that is - it turns out to be -impossible to keep build side-effects limited to *just* this directory -(CodeWarrior can't be told where to place its temp data, and Visual C++ still -alters a few files next to the project ".dsw" file, to name two offenders). +impossible to keep build side-effects limited to *just* this directory. UNIX @@ -86,7 +84,7 @@ WINDOWS There is a "win/" directory which contains subdirectories for a number of compiler systems. Metakit has been built with many different compilers - in the past (Microsoft, Watcom, Symantec, Metrowerks, Optima), + in the past (Microsoft, Watcom, Symantec, Optima), only a few are maintained (there are 12 configurations for MSVC6 alone!). The MS Visual C++ 6.0 project is "win/msvc60/mksrc.dsw", with subprojects @@ -98,11 +96,6 @@ WINDOWS To build with STL containers and strings under MSVC, define "q4_STD". To build with MFC containers and strings under MSVC, define "q4_MFC". - The Metrowerks Codewarrior project is in the "mac/" directory, and can be - used to build both Mac and Windows versions (on either Mac *or* Windows). - The core libraries are built with "mac/cw5.mcp", demos / tests are built - with "cw5apps.mcp", Tcl is "cw5tcl.mcp", and Python is "cw5python.mcp". - The Cygwin build (B20.1 / gcc 2.95.2) is different, because it uses the unix autoconf system, and must be launched as described above for UNIX. I have upgraded to the latest development of libtool to be able to build @@ -113,14 +106,6 @@ WINDOWS efficiency on x86 hardware: "-O2 -m486 -malign-loops=2 -malign-jumps=2". I have not yet tried this myself, but am passing on the tip. -MACINTOSH CLASSIC - - The Mac version requires Metrowerks CodeWarrior 6. See the info above - in the Windows section (MWCW is multi-platform). The projects are all - located in the "mac/" folder, which is also where MWCW will place its own - "... Data" folders with intermediate results. As with all other setups, - final results are made to end up in the "builds/" directory. - LICENSE AND COPYRIGHT STATEMENT =============================== diff --git a/akregator/src/mk4storage/metakit/include/mk4.h b/akregator/src/mk4storage/metakit/include/mk4.h index b6aef603c..2b3112469 100644 --- a/akregator/src/mk4storage/metakit/include/mk4.h +++ b/akregator/src/mk4storage/metakit/include/mk4.h @@ -140,17 +140,6 @@ #endif #endif - // Metrowerks CodeWarrior -#if defined (__MWERKS__) -#if __option(bool) -#define q4_BOOL 1 // bool datatype is optionally supported - // undef, these conflict with c4_Storage::c4_Storage overloading -#undef bool -#undef true -#undef false -#endif -#endif - // Microsoft Visual C++ #if defined (_MSC_VER) // MSVC 5.0 supports the bool datatype, MSVC 4.x has no namespaces diff --git a/akregator/src/mk4storage/metakit/src/Makefile.am b/akregator/src/mk4storage/metakit/src/Makefile.am index 8e6e94db6..acd0db896 100644 --- a/akregator/src/mk4storage/metakit/src/Makefile.am +++ b/akregator/src/mk4storage/metakit/src/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/../include noinst_LTLIBRARIES = libmetakitlocal.la noinst_HEADERS = column.h column.inl custom.h derived.h field.h field.inl format.h gnuc.h handler.h handler.inl header.h mfc.h \ - msvc.h mwcw.h persist.h remap.h std.h store.h store.inl univ.h univ.inl win.h + msvc.h persist.h remap.h std.h store.h store.inl univ.h univ.inl win.h libmetakitlocal_la_SOURCES = column.cpp custom.cpp derived.cpp field.cpp fileio.cpp format.cpp handler.cpp persist.cpp remap.cpp std.cpp store.cpp \ string.cpp table.cpp univ.cpp view.cpp viewx.cpp diff --git a/akregator/src/mk4storage/metakit/src/column.cpp b/akregator/src/mk4storage/metakit/src/column.cpp index 2e8f24d15..1e4efb444 100644 --- a/akregator/src/mk4storage/metakit/src/column.cpp +++ b/akregator/src/mk4storage/metakit/src/column.cpp @@ -1212,8 +1212,6 @@ void c4_ColOfInts::SetAccessWidth(int bits_) if (l2bp1 > 4 && (_mustFlip || ((Persist() != 0) && Strategy()._bytesFlipped))) l2bp1 += 3; // switch to the trailing entries for byte flipping - // Metrowerks Codewarrior 11 is dumb, it requires the "&c4_ColOfInts::" - static tGetter gTab [] = { &c4_ColOfInts::Get_0b, // 0: 0 bits/entry diff --git a/akregator/src/mk4storage/metakit/src/fileio.cpp b/akregator/src/mk4storage/metakit/src/fileio.cpp index 3e749af80..8e69ede76 100644 --- a/akregator/src/mk4storage/metakit/src/fileio.cpp +++ b/akregator/src/mk4storage/metakit/src/fileio.cpp @@ -41,127 +41,6 @@ #endif ///////////////////////////////////////////////////////////////////////////// -// -// The "Carbon" version of a build on Macintosh supports running under -// either MacOS 7..9 (which has no mmap), or MacOS X (which has mmap). -// The logic below was adapted from a contribution by Paul Snively, it -// decides at run time which case it is, and switches I/O calls to match. - -#if defined (q4_CARBON) && q4_CARBON -//#if q4_MAC && !defined (__MACH__) && (!q4_MWCW || __MWERKS__ >= 0x3000) -#undef HAVE_MMAP -#define HAVE_MMAP 1 - -#include <CFBundle.h> -#include <Folders.h> - -#define PROT_NONE 0x00 -#define PROT_READ 0x01 -#define PROT_WRITE 0x02 -#define PROT_EXEC 0x04 - -#define MAP_SHARED 0x0001 -#define MAP_PRIVATE 0x0002 - -#define MAP_FIXED 0x0010 -#define MAP_RENAME 0x0020 -#define MAP_NORESERVE 0x0040 -#define MAP_INHERIT 0x0080 -#define MAP_NOEXTEND 0x0100 -#define MAP_HASSEMAPHORE 0x0200 - -typedef unsigned long t4_u32; - -static t4_u32 sfwRefCount = 0; -static CFBundleRef systemFramework = NULL; - -static char* fake_mmap(char*, t4_u32, int, int, int, long long) - { return (char*) -1L; } -static int fake_munmap(char*, t4_u32) - { return 0; } - -static FILE* (*my_fopen)(const char*,const char*) = fopen; -static int (*my_fclose)(FILE*) = fclose; -static long (*my_ftell)(FILE*) = ftell; -static int (*my_fseek)(FILE*,long,int) = fseek; -static t4_u32 (*my_fread)(void* ptr,t4_u32,t4_u32,FILE*) = fread; -static t4_u32 (*my_fwrite)(const void* ptr,t4_u32,t4_u32,FILE*) = fwrite; -static int (*my_ferror)(FILE*) = ferror; -static int (*my_fflush)(FILE*) = fflush; -static int (*my_fileno)(FILE*) = fileno; -static char* (*my_mmap)(char*,t4_u32,int,int,int,long long) = fake_mmap; -static int (*my_munmap)(char*,t4_u32) = fake_munmap; - -static void InitializeIO() -{ - if (sfwRefCount++) return; // race condition, infinitesimal risk - - FSRef theRef; - if (FSFindFolder(kOnAppropriateDisk, kFrameworksFolderType, - false, &theRef) == noErr) { - CFURLRef fw = CFURLCreateFromFSRef(kCFAllocatorSystemDefault, &theRef); - if (fw) { - CFURLRef bd = - CFURLCreateCopyAppendingPathComponent(kCFAllocatorSystemDefault, - fw, CFSTR("System.framework"), false); - CFRelease(fw); - if (bd) { - systemFramework = CFBundleCreate(kCFAllocatorSystemDefault, bd); - CFRelease(bd); - } - } - if (!systemFramework || !CFBundleLoadExecutable(systemFramework)) - return; -#define F(x) CFBundleGetFunctionPointerForName(systemFramework, CFSTR(#x)) - my_fopen = (FILE* (*)(const char*,const char*)) F(fopen); - my_fclose = (int (*)(FILE*)) F(fclose); - my_ftell = (long (*)(FILE*)) F(ftell); - my_fseek = (int (*)(FILE*,long,int)) F(fseek); - my_fread = (t4_u32 (*)(void* ptr,t4_u32,t4_u32,FILE*)) F(fread); - my_fwrite = (t4_u32 (*)(const void* ptr,t4_u32,t4_u32,FILE*)) F(fwrite); - my_ferror = (int (*)(FILE*)) F(ferror); - my_fflush = (int (*)(FILE*)) F(fflush); - my_fileno = (int (*)(FILE*)) F(fileno); - my_mmap = (char* (*)(char*,t4_u32,int,int,int,long long)) F(mmap); - my_munmap = (int (*)(char*,t4_u32)) F(munmap); -#undef F - d4_assert(my_fopen && my_fclose && my_ftell && my_fseek && - my_fread && my_fwrite && my_ferror && my_fflush && - my_fileno && my_mmap && my_munmap); - } -} - -static void FinalizeIO() -{ - if (--sfwRefCount) return; // race condition, infinitesimal risk - - if (systemFramework) { - CFBundleUnloadExecutable(systemFramework); - CFRelease(systemFramework); - systemFramework = 0; - } -} - -#define fopen my_fopen -#define fclose my_fclose -#define ftell my_ftell -#define fseek my_fseek -#define fread my_fread -#define fwrite my_fwrite -#define ferror my_ferror -#define fflush my_fflush -#define fileno my_fileno -#define mmap my_mmap -#define munmap my_munmap - -#else - -#define InitializeIO() -#define FinalizeIO() - -#endif - -///////////////////////////////////////////////////////////////////////////// #if q4_CHECK #include <stdlib.h> @@ -209,7 +88,6 @@ bool c4_FileStream::Write(const void* buffer_, int length_) c4_FileStrategy::c4_FileStrategy (FILE* file_) : _file (file_), _cleanup (0) { - InitializeIO(); ResetFileMapping(); } @@ -222,7 +100,6 @@ c4_FileStrategy::~c4_FileStrategy () fclose(_cleanup); d4_assert(_mapStart == 0); - FinalizeIO(); } bool c4_FileStrategy::IsValid() const diff --git a/akregator/src/mk4storage/metakit/src/header.h b/akregator/src/mk4storage/metakit/src/header.h index 769e34fe3..8891acaa7 100644 --- a/akregator/src/mk4storage/metakit/src/header.h +++ b/akregator/src/mk4storage/metakit/src/header.h @@ -95,8 +95,6 @@ #define q4_DECC 1 #elif defined (__GNUC__) // GNU C++ #include "gnuc.h" -#elif defined (__MWERKS__) // Metrowerks CodeWarrior C++ -#include "mwcw.h" #elif defined (_MSC_VER) // Microsoft Visual C++ #include "msvc.h" #elif defined (__SC__) // Symantec C++ diff --git a/akregator/src/mk4storage/metakit/src/mwcw.h b/akregator/src/mk4storage/metakit/src/mwcw.h deleted file mode 100644 index 1c863b967..000000000 --- a/akregator/src/mk4storage/metakit/src/mwcw.h +++ /dev/null @@ -1,31 +0,0 @@ -// mwcw.h -- -// $Id$ -// This is part of Metakit, see http://www.equi4.com/metakit/ - -/** @file - * Configuration header for Metrowerks CodeWarrior - */ - -#define q4_MWCW 1 - -///////////////////////////////////////////////////////////////////////////// - -#if q4_68K -#if !__option(IEEEdoubles) -#error Cannot build Metakit with 10-byte doubles -#endif -#endif - -#if __option(bool) -#define q4_BOOL 1 - // undo previous defaults, because q4_BOOL is not set early enough -#undef false -#undef true -#undef bool -#endif - -#undef _MSC_VER - -#pragma export on - -///////////////////////////////////////////////////////////////////////////// diff --git a/akregator/src/mk4storage/metakit/src/string.cpp b/akregator/src/mk4storage/metakit/src/string.cpp index 9df22c5fb..e5d140ab1 100644 --- a/akregator/src/mk4storage/metakit/src/string.cpp +++ b/akregator/src/mk4storage/metakit/src/string.cpp @@ -34,7 +34,7 @@ ///////////////////////////////////////////////////////////////////////////// -#if q4_MSVC || q4_WATC || (q4_MWCW && __MWERKS__ < 0x3000) +#if q4_MSVC || q4_WATC #define strcasecmp stricmp #elif q4_WINCE diff --git a/akregator/src/mk4storage/metakit/src/univ.cpp b/akregator/src/mk4storage/metakit/src/univ.cpp index 446d369d7..08a4ba1ab 100644 --- a/akregator/src/mk4storage/metakit/src/univ.cpp +++ b/akregator/src/mk4storage/metakit/src/univ.cpp @@ -21,8 +21,7 @@ #if q4_UNIX || __MINGW32__ #define _strdup strdup -#elif !q4_MSVC && !q4_WATC && !(q4_MWCW && defined(_WIN32)) && \ - !(q4_MWCW && __MWERKS__ >= 0x3000) +#elif !q4_MSVC && !q4_WATC static char* _strdup(const char* p) { diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp index 0725f57f5..6724d338a 100644 --- a/akregator/src/mk4storage/metakit/tests/regress.cpp +++ b/akregator/src/mk4storage/metakit/tests/regress.cpp @@ -15,11 +15,6 @@ #endif #endif -#if __profile__ - #define q4_MWCW_PROFILER 1 - #include <profiler.h> -#endif - #if q4_NOTHROW const char* msg; #endif @@ -56,10 +51,6 @@ main() DebugNewForgetLeaks(); #endif -#if q4_MWCW_PROFILER - if (!ProfilerInit(collectDetailed, bestTimeBase, 20, 5)) - { -#endif TestBasics1(); TestBasics2(); TestNotify(); @@ -77,12 +68,6 @@ main() TestMapped(); TestLimits(); -#if q4_MWCW_PROFILER - ProfilerDump("\pRegress.prof"); - ProfilerTerm(); - } -#endif - #if defined (_DEBUG) fputs("\nPress return... ", stderr); getchar(); @@ -226,18 +211,14 @@ int StartTest(int mask_, const char* name_, const char* desc_) #if q4_MFC && defined(_DEBUG) TRACE("%s - %-40s *** DISABLED ***\n", name_, desc_); #endif - #if !q4_MWCW_PROFILER - fprintf(stderr, "%s - %-40s *** DISABLED ***\n", name_, desc_); - #endif + fprintf(stderr, "%s - %-40s *** DISABLED ***\n", name_, desc_); return false; } #if q4_MFC && defined(_DEBUG) TRACE("%s - %s\n", name_, desc_); #endif - #if !q4_MWCW_PROFILER - fprintf(stderr, "%s - %s\n", name_, desc_); - #endif + fprintf(stderr, "%s - %s\n", name_, desc_); char buffer [50]; sprintf(buffer, "%s%s.txt", TESTDIR, name_); @@ -254,16 +235,12 @@ int StartTest(int mask_, const char* name_, const char* desc_) void CatchMsg(const char* msg) { - #if !q4_MWCW_PROFILER - fprintf(stderr, "\t%s\n", msg); - #endif + fprintf(stderr, "\t%s\n", msg); printf("*** %s ***\n", msg); } void CatchOther() { - #if !q4_MWCW_PROFILER - fputs("\tException!\n", stderr); - #endif + fputs("\tException!\n", stderr); printf("*** Exception ***\n"); } 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__) - - - - - - - - - diff --git a/indexlib/boost-compat/intrusive_ptr.h b/indexlib/boost-compat/intrusive_ptr.h index a8b5b2e35..a2af559ba 100644 --- a/indexlib/boost-compat/intrusive_ptr.h +++ b/indexlib/boost-compat/intrusive_ptr.h @@ -127,14 +127,6 @@ public: return p_ != 0; } -#elif defined(__MWERKS__) && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) - typedef T * (this_type::*unspecified_bool_type)() const; - - operator unspecified_bool_type() const // never throws - { - return p_ == 0? 0: &this_type::get; - } - #else typedef T * this_type::*unspecified_bool_type; diff --git a/indexlib/boost-compat/shared_ptr.h b/indexlib/boost-compat/shared_ptr.h index a37976fa9..a369dc0f8 100644 --- a/indexlib/boost-compat/shared_ptr.h +++ b/indexlib/boost-compat/shared_ptr.h @@ -244,14 +244,6 @@ public: return px != 0; } -#elif defined(__MWERKS__) && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) - typedef T * (this_type::*unspecified_bool_type)() const; - - operator unspecified_bool_type() const // never throws - { - return px == 0? 0: &this_type::get; - } - #else typedef T * this_type::*unspecified_bool_type; diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp index e272783e5..d4f6c7767 100644 --- a/kaddressbook/main.cpp +++ b/kaddressbook/main.cpp @@ -29,7 +29,7 @@ #include <tdeabc/stdaddressbook.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <kcrash.h> +#include <tdecrash.h> #include <kdebug.h> #include <tdelocale.h> #include <tdestartupinfo.h> diff --git a/karm/karm.tdevelop b/karm/karm.tdevelop deleted file mode 100644 index 963fa7c43..000000000 --- a/karm/karm.tdevelop +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>root</author> - <email>root@duffman</email> - <version>$VERSION$</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts/> - </general> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>sw</toc> - <toc>w3c-dom-level2-html</toc> - <toc>w3c-svg</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </kdevdebugger> - <kdevfilecreate> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevautoproject> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - </make> - <run> - <directoryradio>executable</directoryradio> - <customdirectory>/</customdirectory> - <mainprogram>karm</mainprogram> - <programargs/> - <terminal>false</terminal> - <autocompile>true</autocompile> - <envvars/> - </run> - </kdevautoproject> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> - <kdevcppsupport> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - <creategettersetter> - <prefixGet/> - <prefixSet>set</prefixSet> - <prefixVariable>m_,_</prefixVariable> - <parameterName>theValue</parameterName> - <inlineGet>true</inlineGet> - <inlineSet>true</inlineSet> - </creategettersetter> - <references/> - </kdevcppsupport> -</tdevelop> diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index 888e4e192..8a3f8f741 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -28,7 +28,7 @@ #include <kstandarddirs.h> #include <tdemessagebox.h> #include <dcopclient.h> -#include <kcrash.h> +#include <tdecrash.h> #include <tdeglobal.h> #include <tdeapplication.h> #include <tdeaboutdata.h> diff --git a/tderesources/tvanytime/tvanytime.tdevelop b/tderesources/tvanytime/tvanytime.tdevelop deleted file mode 100644 index 479d2f508..000000000 --- a/tderesources/tvanytime/tvanytime.tdevelop +++ /dev/null @@ -1,202 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Will Stephenson</author> - <email>[email protected]</email> - <version>0.1</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>C++</keyword> - <keyword>Code</keyword> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <versioncontrol>kdevsubversion</versioncontrol> - <ignoreparts/> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - </general> - <kdevautoproject> - <general> - <activetarget>libkcal_tvanytime.la</activetarget> - <useconfiguration>debug</useconfiguration> - </general> - <run> - <mainprogram>src/tvanytime</mainprogram> - <directoryradio>executable</directoryradio> - </run> - <configurations> - <optimized> - <builddir>optimized</builddir> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevg77options</f77compiler> - <cxxflags>-O2 -g0</cxxflags> - </optimized> - <debug> - <configargs>--enable-debug=full</configargs> - <builddir>/space/kde/svn/head/build/tdepim/tderesources/tvanytime</builddir> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevg77options</f77compiler> - <cxxflags>-O0 -g3</cxxflags> - <envvars/> - <topsourcedir>/space/kde/svn/head/src/tdepim/tderesources/tvanytime</topsourcedir> - <cppflags/> - <ldflags/> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <f77flags/> - </debug> - </configurations> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - <abortonerror>true</abortonerror> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin>unsermake </makebin> - <prio>0</prio> - </make> - </kdevautoproject> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>w3c-dom-level2-html</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>w3c-svg</toc> - <toc>sw</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </kdevdebugger> - <kdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevdocumentation> - <projectdoc> - <docsystem>Doxygen Documentation Collection</docsystem> - <docurl>tvanytime.tag</docurl> - </projectdoc> - </kdevdocumentation> - <substmap> - <APPNAME>tvanytime</APPNAME> - <APPNAMELC>tvanytime</APPNAMELC> - <APPNAMESC>Bbcschedule</APPNAMESC> - <APPNAMEUC>BBCSCHEDULE</APPNAMEUC> - <AUTHOR>Will Stephenson</AUTHOR> - <EMAIL>[email protected]</EMAIL> - <LICENSE>GPL</LICENSE> - <LICENSEFILE>COPYING</LICENSEFILE> - <VERSION>0.1</VERSION> - <YEAR>2005</YEAR> - <dest>/space/kde/head/src/tdepim/tderesources/tvanytime</dest> - </substmap> - <kdevcppsupport> - <references> - <pcs>tdelibs</pcs> - <pcs>project</pcs> - <pcs>libkcal</pcs> - </references> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - <qt> - <used>false</used> - <version>3</version> - <root>/usr/lib/qt3</root> - </qt> - <creategettersetter> - <prefixGet/> - <prefixSet>set</prefixSet> - <prefixVariable>m_,_</prefixVariable> - <parameterName>theValue</parameterName> - <inlineGet>true</inlineGet> - <inlineSet>true</inlineSet> - </creategettersetter> - </kdevcppsupport> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> -</tdevelop> |