diff options
| author | Jose <jose@zeroc.com> | 2013-11-26 21:55:01 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-11-26 21:55:01 +0100 |
| commit | d10a2cb6de091828703cef138e65faa4787c42e5 (patch) | |
| tree | 55d309990da561cd4362fa2b0b9f8b774db5bd38 /cpp/test | |
| parent | Fixed OpenSSL deprecation warning on OS X (diff) | |
| download | ice-d10a2cb6de091828703cef138e65faa4787c42e5.tar.bz2 ice-d10a2cb6de091828703cef138e65faa4787c42e5.tar.xz ice-d10a2cb6de091828703cef138e65faa4787c42e5.zip | |
Visual Studio 2013 support
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/Ice/binding/AllTests.cpp | 6 | ||||
| -rw-r--r-- | cpp/test/WinRT/TestSuite/MainPage.xaml.cpp | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp index 75427f4a915..405a2db4127 100644 --- a/cpp/test/Ice/binding/AllTests.cpp +++ b/cpp/test/Ice/binding/AllTests.cpp @@ -849,7 +849,13 @@ allTests(const Ice::CommunicatorPtr& communicator) #if defined(_WIN32) && !defined(ICE_OS_WINRT) OSVERSIONINFO ver; ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); +# if defined(_MSC_VER) && _MSC_VER >= 1800 +# pragma warning (disable : 4996) +# endif GetVersionEx(&ver); +# if defined(_MSC_VER) && _MSC_VER >= 1800 +# pragma warning (default : 4996) +# endif const bool dualStack = ver.dwMajorVersion >= 6; // Windows XP IPv6 doesn't support dual-stack #else const bool dualStack = true; diff --git a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp index a369e3dbda9..0250d115044 100644 --- a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp +++ b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp @@ -48,7 +48,11 @@ printToConsoleOutput(const std::string& message) { output->Text += msg; output->UpdateLayout(); +#if (_WIN32_WINNT > 0x0602) + scroller->ChangeView(nullptr, scroller->ScrollableHeight, nullptr); +#else scroller->ScrollToVerticalOffset(scroller->ScrollableHeight); +#endif }, CallbackContext::Any)); } |