diff options
Diffstat (limited to 'dep/ACE_wrappers')
| -rw-r--r-- | dep/ACE_wrappers/ace/checked_iterator.h | 2 | ||||
| -rw-r--r-- | dep/ACE_wrappers/ace/pre.h | 1 | ||||
| -rw-r--r-- | dep/ACE_wrappers/m4/aio.m4 | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/dep/ACE_wrappers/ace/checked_iterator.h b/dep/ACE_wrappers/ace/checked_iterator.h index fa15cb8f338..3f4c6c14a08 100644 --- a/dep/ACE_wrappers/ace/checked_iterator.h +++ b/dep/ACE_wrappers/ace/checked_iterator.h @@ -37,7 +37,7 @@ # include <iterator> # endif /* _MSC_VER >= 1400 */ -# if defined (_MSC_VER) && (_MSC_FULL_VER >= 140050000) +# if defined (_MSC_VER) && (_MSC_FULL_VER >= 140050000 && _MSC_FULL_VER < 160020506) template <typename PTR> stdext::checked_array_iterator<PTR> ACE_make_checked_array_iterator (PTR buf, size_t len) diff --git a/dep/ACE_wrappers/ace/pre.h b/dep/ACE_wrappers/ace/pre.h index b610c95aeb9..6984b22804e 100644 --- a/dep/ACE_wrappers/ace/pre.h +++ b/dep/ACE_wrappers/ace/pre.h @@ -16,6 +16,7 @@ // No header guard #if defined (_MSC_VER) # pragma warning (disable:4103) +# pragma warning (disable:4005) # pragma pack (push, 8) #elif defined (__BORLANDC__) # pragma option push -a8 -b -Ve- -Vx- -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl -w-sig diff --git a/dep/ACE_wrappers/m4/aio.m4 b/dep/ACE_wrappers/m4/aio.m4 index b38a8b981aa..49fa7d19afd 100644 --- a/dep/ACE_wrappers/m4/aio.m4 +++ b/dep/ACE_wrappers/m4/aio.m4 @@ -64,7 +64,6 @@ if test "$ace_has_aio_funcs" = yes; then #include <string.h> #include <errno.h> #include <stdio.h> -#include <iostream.h> #include <aio.h> |