summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/LoadBalancing
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-01-31 15:46:22 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-01-31 15:46:22 +0000
commit968335f885ba9a8065525617b1a2005fc7953c86 (patch)
tree1abcd199103cecbf68a7eef86d1f630f1b98e244 /TAO/orbsvcs/orbsvcs/LoadBalancing
parent857346fcacc1a8568ade80c0d4aeceb843209eea (diff)
downloadATCD-968335f885ba9a8065525617b1a2005fc7953c86.tar.gz
ChangeLogTag: Mon Jan 31 15:31:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/LoadBalancing')
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
index d7bab7a8e98..729ac23aca5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -22,9 +22,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
#pragma warning(disable:4250)
#endif /* _MSC_VER */
@@ -33,6 +31,7 @@
#include "ace/Array_Base.h"
#include "ace/Hash_Map_Manager_T.h"
#include "ace/Null_Mutex.h"
+#include "ace/SString.h"
/**
* @class TAO_LB_ObjectReferenceFactory
@@ -167,7 +166,7 @@ private:
};
-#if defined (_MSC_VER) && (_MSC_VER >= 1200)
+#if defined (_MSC_VER)
#pragma warning(pop)
#endif /* _MSC_VER */