diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-11-25 09:16:11 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-11-25 09:16:11 +0000 |
| commit | 44f1eb7e6ab5664e2c8bb18a8fc98215a3075c03 (patch) | |
| tree | b4978f1dafffc5ca209f0e58bcfd41b907afec3b | |
| parent | 6729fcc98122c60e5c113e421f74edbafd175ed7 (diff) | |
| download | ATCD-44f1eb7e6ab5664e2c8bb18a8fc98215a3075c03.tar.gz | |
Sun Nov 25 09:15:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/config-win32-msvc-9.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index c662f7328f5..14680a53df1 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Sun Nov 25 09:15:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-win32-msvc9.h: + Disabled warning 4250 with this compiler + Sat Nov 24 00:23:34 UTC 2007 Steve Huston <shuston@riverace.com> * ace/Reactor.h: Clarified the workings of the optional hook function diff --git a/ACE/ace/config-win32-msvc-9.h b/ACE/ace/config-win32-msvc-9.h index a30d76cc321..a8c9ec3ff2e 100644 --- a/ACE/ace/config-win32-msvc-9.h +++ b/ACE/ace/config-win32-msvc-9.h @@ -116,6 +116,9 @@ // Disable warning of using Microsoft Extension. # pragma warning(disable:4231) +// 'class1' : inherits 'class2::member' via dominance +#pragma warning(disable:4250) + // CE (at least thru Windows Mobile 5) doesn't have the new, secure CRT. #if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_TR24731_2005_CRT) # define ACE_HAS_TR24731_2005_CRT |