summaryrefslogtreecommitdiff
path: root/cpp/include/Ice/Config.h
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2001-05-07 23:24:11 +0000
committerMarc Laukien <marc@zeroc.com>2001-05-07 23:24:11 +0000
commiteba8a994342396ac5bb37974be3fd24e321defb5 (patch)
treeb4bf4cff4b44e242ae6ba6a6c7e476fe8f856430 /cpp/include/Ice/Config.h
parentmore and more stuff... (diff)
downloadice-eba8a994342396ac5bb37974be3fd24e321defb5.tar.bz2
ice-eba8a994342396ac5bb37974be3fd24e321defb5.tar.xz
ice-eba8a994342396ac5bb37974be3fd24e321defb5.zip
fixes for windows
Diffstat (limited to 'cpp/include/Ice/Config.h')
-rw-r--r--cpp/include/Ice/Config.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index 0ba7fe24025..629665899ee 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -17,8 +17,10 @@
# pragma warning( disable : 4786 )
// 'this' : used in base member initializer list
# pragma warning( disable : 4355 )
-// class '...' needs to have dll-interface to be used by clients of class ...
+// class ... needs to have dll-interface to be used by clients of class ...
# pragma warning( disable : 4251 )
+// ... : inherits ... via dominance
+# pragma warning( disable : 4250 )
#ifdef ICE_EXPORTS
# define ICE_API __declspec(dllexport)