summaryrefslogtreecommitdiff
path: root/ACE/ace
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2015-07-22 16:08:46 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2015-07-22 16:08:46 +0200
commit10d715e89013186abbc5d7eac535f8cb7c83489c (patch)
tree0bfe943ddf77341ea70f09fdacd2f8f3c196e8b5 /ACE/ace
parent8430ff7587150f24d6a050e0ec3e06659c8c3117 (diff)
downloadATCD-10d715e89013186abbc5d7eac535f8cb7c83489c.tar.gz
Also use =delete with Visual Studio 2015
* ACE/ace/Global_Macros.h:
Diffstat (limited to 'ACE/ace')
-rw-r--r--ACE/ace/Global_Macros.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h
index 2bb86ab1771..5d97d382da5 100644
--- a/ACE/ace/Global_Macros.h
+++ b/ACE/ace/Global_Macros.h
@@ -95,7 +95,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
# define ACE_ENDLESS_LOOP
# endif /* ! ACE_ENDLESS_LOOP */
-# if defined (ACE_NEEDS_FUNC_DEFINITIONS)
+# if defined (ACE_NEEDS_FUNC_DEFINITIONS) && !defined (ACE_HAS_CPP11)
// It just evaporated ;-) Not pleasant.
# define ACE_UNIMPLEMENTED_FUNC(f)
# else