summaryrefslogtreecommitdiff
path: root/cpp/include/IceUtil/IceUtil.h
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-08-01 10:09:48 -0400
committerBernard Normier <bernard@zeroc.com>2016-08-01 10:09:48 -0400
commit4aa7ae5129a9cb66f5ea26165310e96603af576c (patch)
treef8ee6859ad547b59cc28eadb1212f403f51dfff7 /cpp/include/IceUtil/IceUtil.h
parentDo not initialize OpenSSL locks if already done by other library. (diff)
downloadice-4aa7ae5129a9cb66f5ea26165310e96603af576c.tar.bz2
ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.tar.xz
ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.zip
Move StringConverter API to namespace Ice
Diffstat (limited to 'cpp/include/IceUtil/IceUtil.h')
-rw-r--r--cpp/include/IceUtil/IceUtil.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h
index d88df9f83e0..1f9f4b56313 100644
--- a/cpp/include/IceUtil/IceUtil.h
+++ b/cpp/include/IceUtil/IceUtil.h
@@ -41,9 +41,5 @@
#include <IceUtil/UUID.h>
#include <IceUtil/UniquePtr.h>
-#ifndef _WIN32
-# include <IceUtil/IconvStringConverter.h>
-#endif
-
#include <IceUtil/PopDisableWarnings.h>
#endif