summaryrefslogtreecommitdiff
path: root/cpp/src/IceUtil/FileUtil.h
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2015-05-02 14:30:52 -0400
committerBernard Normier <bernard@zeroc.com>2015-05-02 14:30:52 -0400
commit1e3b332b0c6567a084a5a4501e82807aac0a8b22 (patch)
tree01bb71f671cb8bcf296f1e8eceda0501e6b9f5e0 /cpp/src/IceUtil/FileUtil.h
parentICE-6410 - Java error with empty truststore (diff)
downloadice-1e3b332b0c6567a084a5a4501e82807aac0a8b22.tar.bz2
ice-1e3b332b0c6567a084a5a4501e82807aac0a8b22.tar.xz
ice-1e3b332b0c6567a084a5a4501e82807aac0a8b22.zip
Add support for VS 2015 RC (VC140)
Diffstat (limited to 'cpp/src/IceUtil/FileUtil.h')
-rw-r--r--cpp/src/IceUtil/FileUtil.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/cpp/src/IceUtil/FileUtil.h b/cpp/src/IceUtil/FileUtil.h
index 4caf139b148..a833e59e785 100644
--- a/cpp/src/IceUtil/FileUtil.h
+++ b/cpp/src/IceUtil/FileUtil.h
@@ -129,6 +129,10 @@ public:
using std::ifstream::open;
#endif
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+ ifstream(const ifstream&) = delete;
+#endif
+
private:
// Hide const char* definitions since they shouldn't be used.
@@ -148,6 +152,10 @@ public:
using std::ofstream::open;
#endif
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+ ofstream(const ofstream&) = delete;
+#endif
+
private:
// Hide const char* definitions since they shouldn't be used.