summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2021-01-06 14:29:32 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2021-01-06 14:29:32 +0100
commit02c35b3b18ea7254ee99588d726bcfab52049ba7 (patch)
treed97334ec55c91343d926a26a993837ef27a573eb
parent22292c1f52b89ec5966d860ccaef9649a2cbf39e (diff)
downloadATCD-02c35b3b18ea7254ee99588d726bcfab52049ba7.tar.gz
Removed support for the Digital Mars Compiler (DMC), doesn't support C++11
* ACE/ace/config-win32-dmc.h: * ACE/include/makeinclude/platform_win32_dmc.GNU: Deleted. * ACE/ace/OS_NS_stdio.inl: * ACE/ace/config-macros.h: * ACE/ace/config-win32.h: * ACE/ace/os_include/os_fcntl.h:
-rw-r--r--ACE/ace/OS_NS_stdio.inl4
-rw-r--r--ACE/ace/config-macros.h4
-rw-r--r--ACE/ace/config-win32-dmc.h95
-rw-r--r--ACE/ace/config-win32.h2
-rw-r--r--ACE/ace/os_include/os_fcntl.h4
-rw-r--r--ACE/include/makeinclude/platform_win32_dmc.GNU41
6 files changed, 2 insertions, 148 deletions
diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl
index ca964dc9d83..26c8a6a5d8d 100644
--- a/ACE/ace/OS_NS_stdio.inl
+++ b/ACE/ace/OS_NS_stdio.inl
@@ -1127,7 +1127,7 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr)
{
# if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \
(defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \
- defined (ACE_HAS_DINKUM_STL) || defined (__DMC__) || \
+ defined (ACE_HAS_DINKUM_STL)) || \
defined (ACE_HAS_VSWPRINTF) || \
(defined (_MSC_VER) && !defined (ACE_HAS_WINCE))
@@ -1208,7 +1208,7 @@ ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_lis
{
# if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \
(defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \
- (defined (ACE_HAS_DINKUM_STL) || defined (__DMC__)) || \
+ (defined (ACE_HAS_DINKUM_STL)) || \
defined (ACE_HAS_VSWPRINTF) || \
defined (ACE_WIN32)
diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
index 89f7e4512e4..498e7bbe951 100644
--- a/ACE/ace/config-macros.h
+++ b/ACE/ace/config-macros.h
@@ -261,10 +261,6 @@
// conditional statement. @note that may only be true if -O is enabled,
// such as with GreenHills (ghs) 1.8.8.
# define ACE_UNUSED_ARG(a) do {/* null */} while (&a == 0)
-# elif defined (__DMC__)
- #define ACE_UNUSED_ID(identifier)
- template <class T>
- inline void ACE_UNUSED_ARG(const T& ACE_UNUSED_ID(t)) { }
# else /* ghs ..... */
# define ACE_UNUSED_ARG(a) (a)
# endif /* ghs ..... */
diff --git a/ACE/ace/config-win32-dmc.h b/ACE/ace/config-win32-dmc.h
deleted file mode 100644
index e27670396a8..00000000000
--- a/ACE/ace/config-win32-dmc.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// -*- C++ -*-
-// The following configuration file contains defines for Digital Mars compilers.
-
-#ifndef ACE_CONFIG_WIN32_DMC_H
-#define ACE_CONFIG_WIN32_DMC_H
-#include /**/ "ace/pre.h"
-
-#ifndef ACE_CONFIG_WIN32_H
-#error Use config-win32.h in config.h instead of this header
-#endif /* ACE_CONFIG_WIN32_H */
-
-#ifndef WIN32
-# define WIN32
-#endif /* WIN32 */
-
-#undef _M_IX86
-// This turns on ACE_HAS_PENTIUM
-#define _M_IX86 500
-
-#if defined ACE_LACKS_STRUCT_DIR
-# undef ACE_LACKS_STRUCT_DIR
-#endif
-
-// Changed ACE_TEXT to ACE_TEXT in the following line
-# define ACE_CC_NAME ACE_TEXT ("Digital Mars")
-# define ACE_CC_MAJOR_VERSION (1)
-# define ACE_CC_MINOR_VERSION (8)
-# define ACE_CC_BETA_VERSION (9)
-# define ACE_CC_PREPROCESSOR "DMC.EXE"
-# define ACE_CC_PREPROCESSOR_ARGS "-E"
-
-// Microsoft's standard cpp library auto_ptr doesn't have reset ().
-# define ACE_AUTO_PTR_LACKS_RESET
-
-#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS)
-
-// This section below was extracted from config-win32-msvc
-#define ACE_HAS_ITOA
-#define ACE_ITOA_EQUIVALENT ::_itoa
-#define ACE_STRCASECMP_EQUIVALENT ::_stricmp
-#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp
-#define ACE_WCSDUP_EQUIVALENT ::_wcsdup
-// This section above was extracted from config-win32-msvc
-
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL 1
-#define ACE_HAS_SIG_ATOMIC_T 1
-#define ACE_HAS_STANDARD_CPP_LIBRARY 0
-#define ACE_HAS_STRING_CLASS 1
-#define ACE_HAS_USER_MODE_MASKS 1
-#define ACE_LACKS_STRPTIME 1
-#define ACE_SIZEOF_LONG_DOUBLE 10
-#define ACE_TEMPLATES_REQUIRE_SOURCE 1
-#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-#define ACE_HAS_STRBUF_T
-#define ACE_HAS_3_PARAM_WCSTOK
-#define ACE_USES_OLD_IOSTREAMS
-#define ACE_LACKS_UCONTEXT_H
-#define ACE_LACKS_SYS_RESOURCE_H
-#define ACE_LACKS_SYS_WAIT_H
-#define ACE_LACKS_STRINGS_H
-#define ACE_LACKS_SYS_IPC_H
-#define ACE_LACKS_SYS_SEM_H
-#define ACE_LACKS_SEMAPHORE_H
-#define ACE_LACKS_SYS_MMAN_H
-#define ACE_LACKS_SYS_UIO_H
-#define ACE_LACKS_SYS_SOCKET_H
-#define ACE_LACKS_NETINET_IN_H
-#define ACE_LACKS_SYS_IOCTL_H
-#define ACE_LACKS_SYS_SELECT_H
-#define ACE_LACKS_NET_IF_H
-#define ACE_LACKS_DLFCN_H
-#define ACE_LACKS_NETDB_H
-#define ACE_LACKS_SYS_SHM_H
-#define ACE_LACKS_REGEX_H
-#define ACE_LACKS_SYS_MSG_H
-#define ACE_LACKS_NETINET_TCP_H
-#define ACE_LACKS_UNISTD_H
-#define ACE_LACKS_TERMIOS_H
-#define ACE_LACKS_ACE_IOSTREAM
-#define ACE_HAS_NONCONST_TEMPNAM
-
-// Typedefs which we expect DMC to do, but they don't do that
-typedef long o_uid_t;
-typedef long o_gid_t;
-
-#include "io.h"
-#undef umask;
-#undef tell;
-
-# if !defined (ACE_LD_DECORATOR_STR) && defined (_DEBUG)
-# define ACE_LD_DECORATOR_STR ACE_TEXT ("d")
-# endif
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_WIN32_DMC_H */
diff --git a/ACE/ace/config-win32.h b/ACE/ace/config-win32.h
index 3b541a6cdfc..ff98b7fdd87 100644
--- a/ACE/ace/config-win32.h
+++ b/ACE/ace/config-win32.h
@@ -39,8 +39,6 @@
# else
# include "ace/config-win32-mingw.h"
# endif
-#elif defined (__DMC__)
-# include "ace/config-win32-dmc.h"
#else
# error Compiler is not supported
#endif
diff --git a/ACE/ace/os_include/os_fcntl.h b/ACE/ace/os_include/os_fcntl.h
index 97cb355f7c3..542a72e9f67 100644
--- a/ACE/ace/os_include/os_fcntl.h
+++ b/ACE/ace/os_include/os_fcntl.h
@@ -49,10 +49,6 @@ extern "C"
# define _O_TEXT O_TEXT
#endif /* __BORLANDC__ */
-#if defined (__DMC__)
-# define _O_TEMPORARY 0x08 /* see fcntl.h */
-#endif /* __DMC__ */
-
// defined Win32 specific macros for UNIX platforms
#if !defined (O_BINARY)
# define O_BINARY 0
diff --git a/ACE/include/makeinclude/platform_win32_dmc.GNU b/ACE/include/makeinclude/platform_win32_dmc.GNU
deleted file mode 100644
index c9ad273b04b..00000000000
--- a/ACE/include/makeinclude/platform_win32_dmc.GNU
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- Makefile -*-
-
-# debug = 1
-# optimize = 1
-
-winsock2 ?= 1
-debug ?= 1
-optimize ?= 1
-threads ?= 1
-
-pipes = 0
-ifeq ($(debug),0)
-CFLAGS += -DNDEBUG -v1
-CFLAGS += -Ar
-
-CC = dmc
-CXX = dmc
-RC =
-
-CFLAGS += $(MODEL_FLAGS) -ND
-
-EXEEXT = .exe
-
-DCFLAGS += -g
-DLD = link
-LD = link
-
-PIC =
-AR = ar
-ARFLAGS = rsuv
-RANLIB = ranlib
-SOEXT = dll
-SOFLAGS += $(MODEL_FLAGS) $(CPPFLAGS)
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-
-PRELIB = @true
-
-CCFLAGS += $(CFLAGS)
-
-# Dmc doesn't have rwho
-rwho = 0