diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-02-18 19:36:13 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-02-18 19:36:13 +0000 |
| commit | 60727d983c9a371346dcd00b48536a849b467193 (patch) | |
| tree | 90819e655df0f2c6db8dc5088aa942bc8d1225e3 /ACE | |
| parent | ccb1c54173f2dd57ca0042e68ba32c75c8eecf3f (diff) | |
| download | ATCD-60727d983c9a371346dcd00b48536a849b467193.tar.gz | |
Wed Feb 18 19:36:33 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-win32-msvc-7.h:
Layout change
* ace/config-win32-msvc-8.h:
Disable warning 4250, and 4355, we do this for the other
msvc versions but not for vc8
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/ace/config-win32-msvc-7.h | 2 | ||||
| -rw-r--r-- | ACE/ace/config-win32-msvc-8.h | 8 |
3 files changed, 17 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index bda1e3b9595..a1c430cee98 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Wed Feb 18 19:36:33 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-win32-msvc-7.h: + Layout change + + * ace/config-win32-msvc-8.h: + Disable warning 4250, and 4355, we do this for the other + msvc versions but not for vc8 + Wed Feb 18 19:06:33 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * netsvcs/lib/Client_Logging_Handler.cpp: diff --git a/ACE/ace/config-win32-msvc-7.h b/ACE/ace/config-win32-msvc-7.h index fd381591d93..9d1ac7b907b 100644 --- a/ACE/ace/config-win32-msvc-7.h +++ b/ACE/ace/config-win32-msvc-7.h @@ -112,7 +112,7 @@ #pragma warning(disable:4231) // 'function' : unreferenced local function has been removed -# pragma warning(disable:4505) +#pragma warning(disable:4505) // A template can not be exported. Only an instantiation may be exported. #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT diff --git a/ACE/ace/config-win32-msvc-8.h b/ACE/ace/config-win32-msvc-8.h index 05ba1afe649..3ad89528ae8 100644 --- a/ACE/ace/config-win32-msvc-8.h +++ b/ACE/ace/config-win32-msvc-8.h @@ -119,7 +119,13 @@ // Maybe in the future. // Disable warning of using Microsoft Extension. -# pragma warning(disable:4231) +#pragma warning(disable:4231) + +// 'class1' : inherits 'class2::member' via dominance +#pragma warning(disable:4250) + +// 'this' : used in base member initializer list +#pragma warning(disable:4355) // 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) |