Drop Borland compiler specific code

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/138/head
Michele Calgaro 4 weeks ago
parent 694c1459e1
commit 6b1f911676
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -86,7 +86,7 @@ WINDOWS
There is a "win/" directory which contains subdirectories for a number of There is a "win/" directory which contains subdirectories for a number of
compiler systems. Metakit has been built with many different compilers compiler systems. Metakit has been built with many different compilers
in the past (Microsoft, Borland, Watcom, Symantec, Metrowerks, Optima), in the past (Microsoft, Watcom, Symantec, Metrowerks, Optima),
only a few are maintained (there are 12 configurations for MSVC6 alone!). 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 The MS Visual C++ 6.0 project is "win/msvc60/mksrc.dsw", with subprojects
@ -103,9 +103,6 @@ WINDOWS
The core libraries are built with "mac/cw5.mcp", demos / tests are built 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". with "cw5apps.mcp", Tcl is "cw5tcl.mcp", and Python is "cw5python.mcp".
The Borland C++ Builder projects have not yet been incorporated in this
release, but the "KitViewer" application is an example of how to use BCB.
The Cygwin build (B20.1 / gcc 2.95.2) is different, because it uses the 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. 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 I have upgraded to the latest development of libtool to be able to build

@ -114,19 +114,6 @@
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Borland C++ and C++ Builder
#if defined (__BORLANDC__)
// by default, if runtime is linked as a DLL, then so is Metakit
#if defined (_RTLDLL) && !defined (q4_KITDLL)
#define q4_KITDLL 1
#endif
// Borland 5.0 supports the bool datatype
#if __BORLANDC__ >= 0x500
#define q4_BOOL 1
#endif
#endif // __BORLANDC__
// IRIX supports the bool datatype // IRIX supports the bool datatype
// define before gcc to cover both the gcc and MipsPRO compiler // define before gcc to cover both the gcc and MipsPRO compiler
#if defined (sgi) #if defined (sgi)

@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/../include
noinst_LTLIBRARIES = libmetakitlocal.la noinst_LTLIBRARIES = libmetakitlocal.la
noinst_HEADERS = borc.h column.h column.inl custom.h derived.h field.h field.inl format.h gnuc.h handler.h handler.inl header.h mfc.h \ 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 mwcw.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 \ 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 \

@ -1,33 +0,0 @@
// borc.h --
// $Id$
// This is part of Metakit, see http://www.equi4.com/metakit/
/** @file
* Configuration header for Borland C++
*/
#define q4_BORC 1
// get rid of several common warning messages
#if !q4_STRICT
#pragma warn -aus // 'identifier' is assigned a value that is never used
#pragma warn -par // Parameter 'parameter' is never used.
#pragma warn -sig // Conversion may lose significant digits
#pragma warn -use // 'identifier' declared but never used
#endif
#if __BORLANDC__ >= 0x500
#define q4_BOOL 1 // supports the bool datatype
// undo previous defaults, because q4_BOOL is not set early enough
#undef false
#undef true
#undef bool
#endif
#if !defined (q4_EXPORT)
#define q4_EXPORT 1 // requires export/import specifiers
#endif
#if defined (__MT__)
#define q4_MULTI 1 // uses multi-threading
#endif

@ -319,7 +319,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_)
{ {
d4_assert(!_file); d4_assert(!_file);
#if q4_WIN32 && !q4_BORC && !q4_WINCE #if q4_WIN32 && !q4_WINCE
int flags = _O_BINARY | _O_NOINHERIT | (mode_ > 0 ? _O_RDWR : _O_RDONLY); int flags = _O_BINARY | _O_NOINHERIT | (mode_ > 0 ? _O_RDWR : _O_RDONLY);
int fd = _open(fname_, flags); int fd = _open(fname_, flags);
if (fd != -1) if (fd != -1)
@ -330,7 +330,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_)
if (_file != 0) if (_file != 0)
fcntl(fileno(_file), F_SETFD, FD_CLOEXEC); fcntl(fileno(_file), F_SETFD, FD_CLOEXEC);
#endif //q4_UNIX #endif //q4_UNIX
#endif //q4_WIN32 && !q4_BORC && !q4_WINCE #endif //q4_WIN32 && !q4_WINCE
if (_file != 0) { if (_file != 0) {
ResetFileMapping(); ResetFileMapping();
@ -338,7 +338,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_)
} }
if (mode_ > 0) { if (mode_ > 0) {
#if q4_WIN32 && !q4_BORC && !q4_WINCE #if q4_WIN32 && !q4_WINCE
fd = _open(fname_, flags | _O_CREAT, _S_IREAD | _S_IWRITE); fd = _open(fname_, flags | _O_CREAT, _S_IREAD | _S_IWRITE);
if (fd != -1) if (fd != -1)
_cleanup = _file = _fdopen(fd, "w+b"); _cleanup = _file = _fdopen(fd, "w+b");
@ -348,7 +348,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_)
if (_file != 0) if (_file != 0)
fcntl(fileno(_file), F_SETFD, FD_CLOEXEC); fcntl(fileno(_file), F_SETFD, FD_CLOEXEC);
#endif //q4_UNIX #endif //q4_UNIX
#endif //q4_WIN32 && !q4_BORC && !q4_WINCE #endif //q4_WIN32 && !q4_WINCE
} }
//d4_assert(_file != 0); //d4_assert(_file != 0);

@ -91,9 +91,7 @@
// Use '#define q4_xxx 1' to flag the choice of an IDE, and optionally also // Use '#define q4_xxx 1' to flag the choice of an IDE, and optionally also
// add '#include "file.h"' to force inclusion of a header file right here. // add '#include "file.h"' to force inclusion of a header file right here.
#if defined (__BORLANDC__) // Borland C++ #if defined (__DECCXX) // DEC C++
#include "borc.h"
#elif defined (__DECCXX) // DEC C++
#define q4_DECC 1 #define q4_DECC 1
#elif defined (__GNUC__) // GNU C++ #elif defined (__GNUC__) // GNU C++
#include "gnuc.h" #include "gnuc.h"

@ -34,7 +34,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#if q4_MSVC || q4_WATC || q4_BORC || (q4_MWCW && __MWERKS__ < 0x3000) #if q4_MSVC || q4_WATC || (q4_MWCW && __MWERKS__ < 0x3000)
#define strcasecmp stricmp #define strcasecmp stricmp
#elif q4_WINCE #elif q4_WINCE

@ -21,7 +21,7 @@
#if q4_UNIX || __MINGW32__ #if q4_UNIX || __MINGW32__
#define _strdup strdup #define _strdup strdup
#elif !q4_BORC && !q4_MSVC && !q4_WATC && !(q4_MWCW && defined(_WIN32)) && \ #elif !q4_MSVC && !q4_WATC && !(q4_MWCW && defined(_WIN32)) && \
!(q4_MWCW && __MWERKS__ >= 0x3000) !(q4_MWCW && __MWERKS__ >= 0x3000)
static char* _strdup(const char* p) static char* _strdup(const char* p)
@ -33,34 +33,6 @@
return strcpy(s, p); return strcpy(s, p);
} }
#endif
// The Borland C++ RTL does not want file handle objects to cross
// DLL boundaries, so we add special fopen/fclose hooks to this DLL.
#if q4_BORC
#include <stdio.h>
#if q4_WIN32
__declspec(dllexport) FILE*
#else
FILE* __export
#endif
f4_FileOpenInDLL(const char* name_, const char* mode_)
{
return fopen(name_, mode_);
}
#if q4_WIN32
__declspec(dllexport)
#else
int __export
#endif
f4_FileCloseInDLL(FILE* file_)
{
return fclose(file_);
}
#endif #endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

@ -132,14 +132,3 @@ extern void TestStores2();
extern void TestStores3(); extern void TestStores3();
extern void TestStores4(); extern void TestStores4();
extern void TestStores5(); extern void TestStores5();
// The Borland C++ RTL does not want file handle objects to cross
// DLL boundaries, so we use special fopen/fclose hooks in the DLL.
#if defined (__BORLANDC__) // this assumes Metakit is in a DLL!
extern FILE* f4_FileOpenInDLL(const char*, const char*);
extern int f4_FileCloseInDLL(FILE*);
#define fopen f4_FileOpenInDLL
#define fclose f4_FileCloseInDLL
#endif

@ -7,7 +7,7 @@
* LOCATION: see http://www.boost.org for most recent version. * LOCATION: see http://www.boost.org for most recent version.
* FILE auto_link.h * FILE auto_link.h
* VERSION see <boost/version.hpp> * VERSION see <boost/version.hpp>
* DESCRIPTION: Automatic library inclusion for Borland/Microsoft compilers. * DESCRIPTION: Automatic library inclusion for Microsoft compilers.
*/ */
/************************************************************************* /*************************************************************************
@ -29,7 +29,7 @@ has no include guards - so be sure to include it only once from your library!
Algorithm: Algorithm:
~~~~~~~~~~ ~~~~~~~~~~
Libraries for Borland and Microsoft compilers are automatically Libraries for Microsoft compilers are automatically
selected here, the name of the lib is selected according to the following selected here, the name of the lib is selected according to the following
formula: formula:
@ -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: // Only include what follows for known and supported compilers:
// //
#if defined(BOOST_MSVC) \ #if defined(BOOST_MSVC) \
|| defined(__BORLANDC__) \
|| (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) \ || (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) \
|| (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200)) || (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200))
@ -125,11 +124,6 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
// vc80: // vc80:
# define BOOST_LIB_TOOLSET "vc80" # define BOOST_LIB_TOOLSET "vc80"
#elif defined(__BORLANDC__)
// CBuilder 6:
# define BOOST_LIB_TOOLSET "bcb"
#elif defined(__ICL) #elif defined(__ICL)
// Intel C++, no version number: // Intel C++, no version number:
@ -232,37 +226,6 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
# endif # endif
#elif defined(__BORLANDC__)
//
// figure out whether we want the debug builds or not:
//
#pragma defineonoption BOOST_BORLAND_DEBUG -v
//
// sanity check:
//
#if defined(__STL_DEBUG) || defined(_STLP_DEBUG)
#error "Pre-built versions of the Boost libraries are not provided in STLPort-debug form"
#endif
# ifdef _RTLDLL
# ifdef BOOST_BORLAND_DEBUG
# define BOOST_LIB_RT_OPT "-d"
# else
# define BOOST_LIB_RT_OPT
# endif
# else
# ifdef BOOST_BORLAND_DEBUG
# define BOOST_LIB_RT_OPT "-sd"
# else
# define BOOST_LIB_RT_OPT "-s"
# endif
# endif
#endif #endif
// //
@ -296,7 +259,7 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
#endif #endif
#endif // _MSC_VER || __BORLANDC__ #endif // _MSC_VER
// //
// finally undef any macros we may have set: // finally undef any macros we may have set:

@ -1,177 +0,0 @@
// (C) Copyright John Maddock 2001 - 2003.
// (C) Copyright David Abrahams 2002 - 2003.
// (C) Copyright Aleksey Gurtovoy 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.
// Borland C++ compiler setup:
// Version 5.0 and below:
# if __BORLANDC__ <= 0x0550
// Borland C++Builder 4 and 5:
# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
# if __BORLANDC__ == 0x0550
// Borland C++Builder 5, command-line compiler 5.5:
# define BOOST_NO_OPERATORS_IN_NAMESPACE
# endif
# endif
// Version 5.51 and below:
#if (__BORLANDC__ <= 0x551)
# define BOOST_NO_CV_SPECIALIZATIONS
# define BOOST_NO_CV_VOID_SPECIALIZATIONS
# define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
# define BOOST_NO_DEDUCED_TYPENAME
// workaround for missing WCHAR_MAX/WCHAR_MIN:
#include <climits>
#include <cwchar>
#ifndef WCHAR_MAX
# define WCHAR_MAX 0xffff
#endif
#ifndef WCHAR_MIN
# define WCHAR_MIN 0
#endif
#endif
#if (__BORLANDC__ <= 0x564)
# define BOOST_NO_SFINAE
#endif
// Version 7.0 (Kylix) and below:
#if (__BORLANDC__ <= 0x570)
# define BOOST_NO_INTEGRAL_INT64_T
# define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS
# define BOOST_NO_PRIVATE_IN_AGGREGATE
# define BOOST_NO_USING_TEMPLATE
# define BOOST_BCB_PARTIAL_SPECIALIZATION_BUG
# define BOOST_NO_TEMPLATE_TEMPLATES
# define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
// we shouldn't really need this - but too many things choke
// without it, this needs more investigation:
# define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
# define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
# ifdef NDEBUG
// fix broken <cstring> so that Boost.test works:
# include <cstring>
# undef strcmp
# endif
//
// new bug in 5.61:
#if (__BORLANDC__ >= 0x561) && (__BORLANDC__ <= 0x570)
// this seems to be needed by the command line compiler, but not the IDE:
# define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
#endif
# ifdef _WIN32
# define BOOST_NO_SWPRINTF
# elif defined(linux) || defined(__linux__) || defined(__linux)
// we should really be able to do without this
// but the wcs* functions aren't imported into std::
# define BOOST_NO_STDC_NAMESPACE
// _CPPUNWIND doesn't get automatically set for some reason:
# pragma defineonoption BOOST_CPPUNWIND -x
# endif
#endif
//
// Post 0x561 we have long long and stdint.h:
#if __BORLANDC__ >= 0x561
# ifndef __NO_LONG_LONG
# define BOOST_HAS_LONG_LONG
# endif
// On non-Win32 platforms let the platform config figure this out:
# ifdef _WIN32
# define BOOST_HAS_STDINT_H
# endif
#endif
// Borland C++Builder 6 defaults to using STLPort. If _USE_OLD_RW_STL is
// defined, then we have 0x560 or greater with the Rogue Wave implementation
// which presumably has the std::DBL_MAX bug.
#if ((__BORLANDC__ >= 0x550) && (__BORLANDC__ < 0x560)) || defined(_USE_OLD_RW_STL)
// <climits> is partly broken, some macros define symbols that are really in
// namespace std, so you end up having to use illegal constructs like
// std::DBL_MAX, as a fix we'll just include float.h and have done with:
#include <float.h>
#endif
//
// __int64:
//
#if (__BORLANDC__ >= 0x530) && !defined(__STRICT_ANSI__)
# define BOOST_HAS_MS_INT64
#endif
//
// check for exception handling support:
//
#if !defined(_CPPUNWIND) && !defined(BOOST_CPPUNWIND) && !defined(__EXCEPTIONS)
# define BOOST_NO_EXCEPTIONS
#endif
//
// all versions have a <dirent.h>:
//
#ifndef __STRICT_ANSI__
# define BOOST_HAS_DIRENT_H
#endif
//
// all versions support __declspec:
//
#ifndef __STRICT_ANSI__
# define BOOST_HAS_DECLSPEC
#endif
//
// ABI fixing headers:
//
#if __BORLANDC__ < 0x600 // not implemented for version 6 compiler yet
#ifndef BOOST_ABI_PREFIX
# define BOOST_ABI_PREFIX "boost/config/abi/borland_prefix.hpp"
#endif
#ifndef BOOST_ABI_SUFFIX
# define BOOST_ABI_SUFFIX "boost/config/abi/borland_suffix.hpp"
#endif
#endif
//
// Disable Win32 support in ANSI mode:
//
#if __BORLANDC__ < 0x600
# pragma defineonoption BOOST_DISABLE_WIN32 -A
#elif defined(__STRICT_ANSI__)
# define BOOST_DISABLE_WIN32
#endif
//
// MSVC compatibility mode does some nasty things:
//
#if defined(_MSC_VER) && (_MSC_VER <= 1200)
# define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
# define BOOST_NO_VOID_RETURNS
#endif
#define BOOST_COMPILER "Borland C++ version " BOOST_STRINGIZE(__BORLANDC__)
//
// versions check:
// we don't support Borland prior to version 5.4:
#if __BORLANDC__ < 0x540
# error "Compiler not supported or configured - please reconfigure"
#endif
//
// last known and checked version is 1536 (Builder X preview):
#if (__BORLANDC__ > 1536)
# if defined(BOOST_ASSERT_CONFIG)
# error "Unknown compiler version - please run the configure tests and report the results"
# else
# pragma message( "Unknown compiler version - please run the configure tests and report the results")
# endif
#endif

@ -54,10 +54,6 @@
// Compaq Tru64 Unix cxx // Compaq Tru64 Unix cxx
# error "Compiler threading support is not turned on. Please set the correct command line options for threading: -pthread" # error "Compiler threading support is not turned on. Please set the correct command line options for threading: -pthread"
#elif defined __BORLANDC__
// Borland
# error "Compiler threading support is not turned on. Please set the correct command line options for threading: -tWM"
#elif defined __MWERKS__ #elif defined __MWERKS__
// Metrowerks CodeWarrior // 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" # 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"

@ -44,10 +44,6 @@
// Greenhills C++ // Greenhills C++
# define BOOST_COMPILER_CONFIG "boost/config/compiler/greenhills.hpp" # define BOOST_COMPILER_CONFIG "boost/config/compiler/greenhills.hpp"
#elif defined __BORLANDC__
// Borland
# define BOOST_COMPILER_CONFIG "boost/config/compiler/borland.hpp"
#elif defined __MWERKS__ #elif defined __MWERKS__
// Metrowerks CodeWarrior // Metrowerks CodeWarrior
# define BOOST_COMPILER_CONFIG "boost/config/compiler/metrowerks.hpp" # define BOOST_COMPILER_CONFIG "boost/config/compiler/metrowerks.hpp"

@ -22,7 +22,7 @@
#if defined(_CPPLIB_VER) && (_CPPLIB_VER >= 306) #if defined(_CPPLIB_VER) && (_CPPLIB_VER >= 306)
// full dinkumware 3.06 and above // full dinkumware 3.06 and above
// fully conforming provided the compiler supports it: // fully conforming provided the compiler supports it:
# if !(defined(_GLOBAL_USING) && (_GLOBAL_USING+0 > 0)) && !defined(__BORLANDC__) && !defined(_STD) && !(defined(__ICC) && (__ICC >= 700)) // can be defined in yvals.h # if !(defined(_GLOBAL_USING) && (_GLOBAL_USING+0 > 0)) && !defined(_STD) && !(defined(__ICC) && (__ICC >= 700)) // can be defined in yvals.h
# define BOOST_NO_STDC_NAMESPACE # define BOOST_NO_STDC_NAMESPACE
# endif # endif
# if !(defined(_HAS_MEMBER_TEMPLATES_REBIND) && (_HAS_MEMBER_TEMPLATES_REBIND+0 > 0)) && !(defined(_MSC_VER) && (_MSC_VER > 1300)) && defined(BOOST_MSVC) # if !(defined(_HAS_MEMBER_TEMPLATES_REBIND) && (_HAS_MEMBER_TEMPLATES_REBIND+0 > 0)) && !(defined(_MSC_VER) && (_MSC_VER > 1300)) && defined(BOOST_MSVC)
@ -66,12 +66,12 @@
// the same applies to other compilers that sit on top // the same applies to other compilers that sit on top
// of vc7.1 (Intel and Comeau): // of vc7.1 (Intel and Comeau):
// //
#if defined(_MSC_VER) && (_MSC_VER >= 1310) && !defined(__BORLANDC__) #if defined(_MSC_VER) && (_MSC_VER >= 1310)
# define BOOST_STD_EXTENSION_NAMESPACE stdext # define BOOST_STD_EXTENSION_NAMESPACE stdext
#endif #endif
#if (defined(_MSC_VER) && (_MSC_VER <= 1300) && !defined(__BORLANDC__)) || !defined(_CPPLIB_VER) || (_CPPLIB_VER < 306) #if (defined(_MSC_VER) && (_MSC_VER <= 1300)) || !defined(_CPPLIB_VER) || (_CPPLIB_VER < 306)
// if we're using a dinkum lib that's // if we're using a dinkum lib that's
// been configured for VC6/7 then there is // been configured for VC6/7 then there is
// no iterator traits (true even for icl) // no iterator traits (true even for icl)

@ -47,13 +47,6 @@
# define BOOST_NO_LONG_LONG_NUMERIC_LIMITS # define BOOST_NO_LONG_LONG_NUMERIC_LIMITS
# endif # endif
//
// Borland version of numeric_limits lacks __int64 specialisation:
//
#ifdef __BORLANDC__
# define BOOST_NO_MS_INT64_NUMERIC_LIMITS
#endif
// //
// No std::iterator if it can't figure out default template args: // No std::iterator if it can't figure out default template args:
// //

@ -52,11 +52,11 @@
// then the io stream facets are not available in namespace std:: // then the io stream facets are not available in namespace std::
// //
#ifdef _STLPORT_VERSION #ifdef _STLPORT_VERSION
# if !defined(_STLP_OWN_IOSTREAMS) && defined(_STLP_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) && !defined(__BORLANDC__) # if !defined(_STLP_OWN_IOSTREAMS) && defined(_STLP_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE)
# define BOOST_NO_STD_LOCALE # define BOOST_NO_STD_LOCALE
# endif # endif
#else #else
# if !defined(__SGI_STL_OWN_IOSTREAMS) && defined(__STL_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) && !defined(__BORLANDC__) # if !defined(__SGI_STL_OWN_IOSTREAMS) && defined(__STL_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE)
# define BOOST_NO_STD_LOCALE # define BOOST_NO_STD_LOCALE
# endif # endif
#endif #endif
@ -106,13 +106,7 @@
// but doesn't always get them all, define BOOST_NO_STDC_NAMESPACE, since our // but doesn't always get them all, define BOOST_NO_STDC_NAMESPACE, since our
// workaround does not conflict with STLports: // workaround does not conflict with STLports:
// //
// #if !defined(__DMC__)
// Harold Howe says:
// Borland switched to STLport in BCB6. Defining BOOST_NO_STDC_NAMESPACE with
// BCB6 does cause problems. If we detect C++ Builder, then don't define
// BOOST_NO_STDC_NAMESPACE
//
#if !defined(__BORLANDC__) && !defined(__DMC__)
// //
// If STLport is using it's own namespace, and the real names are in // If STLport is using it's own namespace, and the real names are in
// the global namespace, then we duplicate STLport's using declarations // the global namespace, then we duplicate STLport's using declarations
@ -127,21 +121,6 @@
# define BOOST_NO_STDC_NAMESPACE # define BOOST_NO_STDC_NAMESPACE
# define BOOST_NO_EXCEPTION_STD_NAMESPACE # define BOOST_NO_EXCEPTION_STD_NAMESPACE
# endif # endif
#elif defined(__BORLANDC__) && __BORLANDC__ < 0x560
// STLport doesn't import std::abs correctly:
#include <stdlib.h>
namespace std { using ::abs; }
// and strcmp/strcpy don't get imported either ('cos they are macros)
#include <string.h>
#ifdef strcpy
# undef strcpy
#endif
#ifdef strcmp
# undef strcmp
#endif
#ifdef _STLP_VENDOR_CSTD
namespace std{ using _STLP_VENDOR_CSTD::strcmp; using _STLP_VENDOR_CSTD::strcpy; }
#endif
#endif #endif
// //
@ -172,14 +151,6 @@ namespace std{ using _STLP_VENDOR_CSTD::strcmp; using _STLP_VENDOR_CSTD::strcpy;
# define BOOST_NO_INTRINSIC_WCHAR_T # define BOOST_NO_INTRINSIC_WCHAR_T
#endif #endif
//
// Borland ships a version of STLport with C++ Builder 6 that lacks
// hashtables and the like:
//
#if defined(__BORLANDC__) && (__BORLANDC__ == 0x560)
# undef BOOST_HAS_HASH
#endif
// //
// gcc-2.95.3/STLPort does not like the using declarations we use to get ADL with std::min/max // gcc-2.95.3/STLPort does not like the using declarations we use to get ADL with std::min/max
// //

@ -32,7 +32,7 @@
// //
#include <limits.h> #include <limits.h>
# if !defined(BOOST_HAS_LONG_LONG) \ # if !defined(BOOST_HAS_LONG_LONG) \
&& !(defined(BOOST_MSVC) && BOOST_MSVC <=1300) && !defined(__BORLANDC__) \ && !(defined(BOOST_MSVC) && BOOST_MSVC <=1300) \
&& (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX)) && (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX))
# define BOOST_HAS_LONG_LONG # define BOOST_HAS_LONG_LONG
#endif #endif

@ -146,7 +146,6 @@ public:
#endif #endif
// operator! is a Borland-specific workaround
bool operator! () const bool operator! () const
{ {
return p_ == 0; return p_ == 0;

@ -106,7 +106,6 @@ template<class T> class shared_ptr
{ {
private: private:
// Borland 5.5.1 specific workaround
typedef shared_ptr<T> this_type; typedef shared_ptr<T> this_type;
public: public:
@ -139,8 +138,8 @@ public:
// generated copy constructor, assignment, destructor are fine... // generated copy constructor, assignment, destructor are fine...
// except that Borland C++ has a bug, and g++ with -Wsynth warns // except that g++ with -Wsynth warns
#if defined(__BORLANDC__) || defined(__GNUC__) #if defined(__GNUC__)
shared_ptr & operator=(shared_ptr const & r) // never throws shared_ptr & operator=(shared_ptr const & r) // never throws
{ {

@ -27,7 +27,6 @@ template<class T> class weak_ptr
{ {
private: private:
// Borland 5.5.1 specific workarounds
typedef weak_ptr<T> this_type; typedef weak_ptr<T> this_type;
public: public:

@ -7,7 +7,6 @@ probably a good idea to take a look at that file anyway.
There are several makefiles available. Makefile.unx is a makefile for a There are several makefiles available. Makefile.unx is a makefile for a
generic UNIX system. Makefile.vc is a makefile for Visual C++ 4 or 5. generic UNIX system. Makefile.vc is a makefile for Visual C++ 4 or 5.
Makefile.bc is a makefile for Borland C++ 5.
If you are using the library on a non-UNIX system, such as Windows 3.1 or If you are using the library on a non-UNIX system, such as Windows 3.1 or
Macintosh, you will probably need to change msgid.cpp. The function Macintosh, you will probably need to change msgid.cpp. The function

@ -4243,14 +4243,10 @@ soap_begin_send(struct soap *soap)
#ifndef UNDER_CE #ifndef UNDER_CE
#ifndef WITH_FASTCGI #ifndef WITH_FASTCGI
if (!soap_valid_socket(soap->socket)) /* Set win32 stdout or soap->sendfd to BINARY, e.g. to support DIME */ if (!soap_valid_socket(soap->socket)) /* Set win32 stdout or soap->sendfd to BINARY, e.g. to support DIME */
#ifdef __BORLANDC__
setmode((SOAP_SOCKET)soap->sendfd, O_BINARY);
#else
_setmode((SOAP_SOCKET)soap->sendfd, _O_BINARY); _setmode((SOAP_SOCKET)soap->sendfd, _O_BINARY);
#endif #endif
#endif #endif
#endif #endif
#endif
#endif #endif
if (soap->mode & SOAP_IO) if (soap->mode & SOAP_IO)
{ soap->bufidx = 0; { soap->bufidx = 0;
@ -10818,14 +10814,10 @@ soap_begin_recv(struct soap *soap)
#ifndef UNDER_CE #ifndef UNDER_CE
#ifndef WITH_FASTCGI #ifndef WITH_FASTCGI
if (!soap_valid_socket(soap->socket)) if (!soap_valid_socket(soap->socket))
#ifdef __BORLANDC__
setmode((SOAP_SOCKET)soap->recvfd, O_BINARY);
#else
_setmode((SOAP_SOCKET)soap->recvfd, _O_BINARY); _setmode((SOAP_SOCKET)soap->recvfd, _O_BINARY);
#endif #endif
#endif #endif
#endif #endif
#endif
#ifdef WITH_ZLIB #ifdef WITH_ZLIB
soap->mode &= ~SOAP_ENC_ZLIB; soap->mode &= ~SOAP_ENC_ZLIB;
soap->zlib_in = SOAP_ZLIB_NONE; soap->zlib_in = SOAP_ZLIB_NONE;

@ -139,14 +139,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
# endif # endif
#endif #endif
#ifdef __BORLANDC__
# ifdef __WIN32__
# ifndef WIN32
# define WIN32
# endif
# endif
#endif
#ifdef __CYGWIN__ #ifdef __CYGWIN__
# ifndef CYGWIN # ifndef CYGWIN
# define CYGWIN # define CYGWIN
@ -560,9 +552,6 @@ extern "C" {
#elif defined(UNDER_CE) #elif defined(UNDER_CE)
# define LONG64 __int64 # define LONG64 __int64
# define ULONG64 unsigned LONG64 # define ULONG64 unsigned LONG64
#elif defined(__BORLANDC__)
# define LONG64 __int64
# define ULONG64 unsigned LONG64
#endif #endif
#if defined(WIN32) #if defined(WIN32)

Loading…
Cancel
Save