OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-04 12:40:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4448 Move Resinsight from -std=c++0x to -std=c++11 on GNU CXX

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-05-28 12:57:56 +02:00
parent 6839e82613
commit 6ba9d42b45
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -24,7 +24,7 @@ elseif(MSVC)
endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(CMAKE_CXX_FLAGS "-DCVF_LINUX -pipe -Wextra -Woverloaded-virtual -Wformat -std=c++0x")
set(CMAKE_CXX_FLAGS "-DCVF_LINUX -pipe -Wextra -Woverloaded-virtual -Wformat -std=c++11")
set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -g3 -O0 -DDEBUG -D_DEBUG")
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNO_DEBUG")
endif()

3
Fwk/VizFwk/LibCore/cvfColor3.cpp
View File

@ -362,7 +362,8 @@ Color3ub::Color3ub(ColorIdent colorIdent)
case YELLOW_GREEN: set(154, 205, 50); break;
case CEETRON: set( 81, 134, 148); break;
default: CVF_FAIL_MSG("Unknown ColorIdent");
default: set(0, 0, 0);
CVF_FAIL_MSG("Unknown ColorIdent");
}
}