diff options
| author | megamage <none@none> | 2009-05-22 16:36:54 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-05-22 16:36:54 -0500 |
| commit | ceaf8c13bbf9dbe407d48bc489c0fc02e7e6aef4 (patch) | |
| tree | d3832cd813f3a899d32eca7fe03a9e3acd314e45 /dep | |
| parent | a59b275206ff908cbb8f5007a3230db618154822 (diff) | |
[7866] Added VS 2010 Beta 1 project files. Requires libeay32.dll update. This is experimental changes. Use it on own risk. Author: tomrus88
*Note: this is not supported by TC
--HG--
branch : trunk
Diffstat (limited to 'dep')
| -rw-r--r-- | dep/ACE_wrappers/ace/checked_iterator.h | 2 | ||||
| -rw-r--r-- | dep/ACE_wrappers/ace/pre.h | 1 |
2 files changed, 2 insertions, 1 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 |