diff options
| author | Bernard Normier <bernard@zeroc.com> | 2015-05-02 14:30:52 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2015-05-02 14:30:52 -0400 |
| commit | 1e3b332b0c6567a084a5a4501e82807aac0a8b22 (patch) | |
| tree | 01bb71f671cb8bcf296f1e8eceda0501e6b9f5e0 /cpp/src/IceUtil | |
| parent | ICE-6410 - Java error with empty truststore (diff) | |
| download | ice-1e3b332b0c6567a084a5a4501e82807aac0a8b22.tar.bz2 ice-1e3b332b0c6567a084a5a4501e82807aac0a8b22.tar.xz ice-1e3b332b0c6567a084a5a4501e82807aac0a8b22.zip | |
Add support for VS 2015 RC (VC140)
Diffstat (limited to 'cpp/src/IceUtil')
| -rw-r--r-- | cpp/src/IceUtil/Exception.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceUtil/FileUtil.h | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp index 3eb63677a08..d21946f8195 100644 --- a/cpp/src/IceUtil/Exception.cpp +++ b/cpp/src/IceUtil/Exception.cpp @@ -40,6 +40,10 @@ # if defined(_MSC_VER) && _MSC_VER >= 1700 # define DBGHELP_TRANSLATE_TCHAR # include <IceUtil/StringConverter.h> +# if _MSC_VER >= 1900 +# // VS 2015 RC issues this warning for code in DbgHelp.h +# pragma warning(disable:4091) +# endif # endif # include <DbgHelp.h> # include <tchar.h> 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. |