diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-09-10 21:08:07 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-09-10 21:08:07 +0000 |
| commit | fa07b19c8faf0e98ed6023c7946bb51403b12f2e (patch) | |
| tree | 1ffd63f4e2e4c698f317524a852ef356b46a9b96 | |
| parent | 5255f6c665d555ee24e07180e79cec1ec5b7e456 (diff) | |
| download | ATCD-fa07b19c8faf0e98ed6023c7946bb51403b12f2e.tar.gz | |
ChangeLogTag: Wed Sep 10 16:03:50 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tao/RTScheduling/RTScheduler_Manager.h | 12 |
2 files changed, 9 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c05706d3f38..a29d9b2e701 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Wed Sep 10 16:03:50 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/RTScheduling/RTScheduler_Manager.h: + + Removed all manipulations of MSVC #pragma warning disables. + Everything necessary is already in config-win32-msvc-*.h + and the further #pragmas were actually re-enabling some of + the warnings. + Wed Sep 10 13:19:23 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * orbsvcs/orbsvcs/IFRService/tmplinst.cpp: diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h index 309a70b3ca1..5ae9d86273e 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.h +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h @@ -13,15 +13,7 @@ #ifndef TAO_PRIORITY_MAPPING_MANAGER_H #define TAO_PRIORITY_MAPPING_MANAGER_H -#if defined (_MSC_VER) -#if (_MSC_VER >= 1200) -#pragma warning (push) -#endif /* _MSC_VER >= 1200 */ -#pragma warning (disable:4250) -#endif /* _MSC_VER */ - #include "RTScheduler.h" -//#include "tao/LocalObject.h" class TAO_RTScheduler_Manager; class TAO_RTScheduler_Manager_var; @@ -145,10 +137,6 @@ private: TAO_RTScheduler_Manager_ptr &ptr_; }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -#pragma warning(pop) -#endif /* _MSC_VER */ - #if defined (__ACE_INLINE__) #include "RTScheduler_Manager.i" #endif /* __ACE_INLINE__ */ |