blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Revert "Cleanup/MSVC: Enable C++ conformance mode on compiler versions that support it." 

It is breaking compilation on some configurations, revert for now while
i see what is wrong.

This reverts commit 9fe469c110.
This commit is contained in:
Ray molenkamp 2020-02-13 07:04:30 -07:00
parent d1cd3ec9ba
commit 6022cd015f
5 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build_files/cmake/platform/platform_win32.cmake
View File

@ -144,19 +144,6 @@ else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /nologo /J /Gd /MP /bigobj")
endif()
# C++ standards conformace (/permissive-) is available on msvc 15.5 (1912) and up
if(MSVC_VERSION GREATER 1911 AND NOT MSVC_CLANG)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /permissive-")
# MSVC 2017 emits a whole lot of warnings (C4199) about two-phase lookup
# in combination with OpenMP, however my current MSVC2019 (16.4) does not.
# From the documentation it is not entirely clear when this got solved,
# so for any compiler versions >= 15.5 and < 16.4 opt in to the old non-conforming behavior.
if(MSVC_VERSION LESS 1924)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Zc:twoPhase-")
endif()
endif()
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd /ZI")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MDd /ZI")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")

4
extern/mantaflow/CMakeLists.txt vendored
View File

@ -54,10 +54,6 @@ if(WITH_OPENVDB)
add_definitions(-DOPENVDB_STATICLIB)
endif()
if(WIN32)
add_definitions(-D_USE_MATH_DEFINES)
endif()
set(INC
${MANTA_PP}
${MANTA_PP}/fileio

24
intern/ghost/intern/GHOST_ContextWGL.cpp
View File

@ -647,11 +647,9 @@ GHOST_TSuccess GHOST_ContextWGL::initializeDrawingContext()
/* Silence warnings interpreted as errors by users when trying to get
* a context with version higher than 3.3 Core. */
{
const bool silent = m_contextMajorVersion > 3;
if (!WIN32_CHK_SILENT(m_hGLRC != NULL, silent)) {
goto error;
}
const bool silent = m_contextMajorVersion > 3;
if (!WIN32_CHK_SILENT(m_hGLRC != NULL, silent)) {
goto error;
}
s_sharedCount++;
@ -682,17 +680,15 @@ GHOST_TSuccess GHOST_ContextWGL::initializeDrawingContext()
::SwapBuffers(m_hDC);
#ifndef NDEBUG
{
const char *vendor = reinterpret_cast<const char *>(glGetString(GL_VENDOR));
const char *renderer = reinterpret_cast<const char *>(glGetString(GL_RENDERER));
const char *version = reinterpret_cast<const char *>(glGetString(GL_VERSION));
const char *vendor = reinterpret_cast<const char *>(glGetString(GL_VENDOR));
const char *renderer = reinterpret_cast<const char *>(glGetString(GL_RENDERER));
const char *version = reinterpret_cast<const char *>(glGetString(GL_VERSION));
reportContextString("Vendor", m_dummyVendor, vendor);
reportContextString("Renderer", m_dummyRenderer, renderer);
reportContextString("Version", m_dummyVersion, version);
reportContextString("Vendor", m_dummyVendor, vendor);
reportContextString("Renderer", m_dummyRenderer, renderer);
reportContextString("Version", m_dummyVersion, version);
fprintf(stderr, "Context Version: %d.%d\n", m_contextMajorVersion, m_contextMinorVersion);
}
fprintf(stderr, "Context Version: %d.%d\n", m_contextMajorVersion, m_contextMinorVersion);
#endif
return GHOST_kSuccess;

5
intern/mantaflow/CMakeLists.txt
View File

@ -30,11 +30,6 @@ if(WITH_OPENVDB)
add_definitions(-DOPENVDB_STATICLIB)
endif()
if(WIN32)
add_definitions(-D_USE_MATH_DEFINES)
endif()
set(INC
extern
intern/strings

5
source/blender/collada/MeshImporter.cpp
View File

@ -19,7 +19,10 @@
*/
#include <algorithm>
#include <iostream>
#if !defined(WIN32)
# include <iostream>
#endif
/* COLLADABU_ASSERT, may be able to remove later */
#include "COLLADABUPlatform.h"