summaryrefslogtreecommitdiff
path: root/ACE/ace/config-icc-common.h
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2021-01-05 18:05:19 +0100
committerGitHub <noreply@github.com>2021-01-05 18:05:19 +0100
commit7c231c23bf5f368789166d234f91e2be5c39bb54 (patch)
tree4d953af6237c36bfe3bf0689d5d4b3a8a2ae44d0 /ACE/ace/config-icc-common.h
parent975aedf61a4f751e76e4abfa7d8235e608ae37cb (diff)
parent169c93b6746c3a9591b58cfb7404d14dde3df2f8 (diff)
downloadATCD-7c231c23bf5f368789166d234f91e2be5c39bb54.tar.gz
Merge branch 'master' into jwi-ACE_HAS_CPLUSPLUS_HEADERS
Diffstat (limited to 'ACE/ace/config-icc-common.h')
-rw-r--r--ACE/ace/config-icc-common.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h
index 9e104cb8f93..4a7db850aa8 100644
--- a/ACE/ace/config-icc-common.h
+++ b/ACE/ace/config-icc-common.h
@@ -3,9 +3,7 @@
#define ACE_LINUX_ICC_COMMON_H
#include /**/ "ace/pre.h"
-# define ACE_HAS_STDCPP_STL_INCLUDES
# define ACE_HAS_STANDARD_CPP_LIBRARY 1
-# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
# define ACE_HAS_STRING_CLASS