Delete some unused variables and disable warnings

This commit is contained in:
Magne Sjaastad 2023-05-21 15:15:09 +02:00 committed by GitHub
parent eb0f2207b5
commit bce8177033
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 17 deletions

View File

@ -36,10 +36,13 @@ set(BUILD_SHARED_LIBS
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
option(RESINSIGHT_BUNDLE_TESTMODELS "Copy TestModels into the installation" OFF)
mark_as_advanced(RESINSIGHT_BUNDLE_TESTMODELS)
option(RESINSIGHT_VCPKG_AUTO_INSTALL
"Automatically download build pre-requisites with VCPKG" OFF
)
mark_as_advanced(RESINSIGHT_VCPKG_AUTO_INSTALL)
if(RESINSIGHT_VCPKG_AUTO_INSTALL)
include(AutoVcpkg)
set(AUTO_VCPKG_ROOT "${CMAKE_SOURCE_DIR}/ThirdParty/vcpkg")
@ -322,6 +325,8 @@ find_package(Git QUIET)
if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
# Update submodules as needed
option(RESINSIGHT_UPDATE_SUBMODULES "Check submodules during build" ON)
mark_as_advanced(RESINSIGHT_UPDATE_SUBMODULES)
if(RESINSIGHT_UPDATE_SUBMODULES)
set(SUBDIR "${PROJECT_SOURCE_DIR}/ThirdParty")
message(STATUS "Initializing GIT submodules")
@ -435,6 +440,7 @@ add_subdirectory(ThirdParty/custom-opm-flowdiag-app)
# Option used to build opm-common from source or use precompiled binaries
option(RESINSIGHT_BUILD_LIBS_FROM_SOURCE "Build opm-common from source" ON)
mark_as_advanced(RESINSIGHT_BUILD_LIBS_FROM_SOURCE)
if((NOT RESINSIGHT_BUILD_LIBS_FROM_SOURCE) AND MSVC)
FetchContent_Declare(
@ -727,6 +733,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
)
target_compile_options(
cafCommandFeatures PRIVATE -Wno-deprecated-copy -Wno-undefined-var-template
-Wno-deprecated-enum-enum-conversion
)
target_compile_options(
cafVizExtensions PRIVATE -Wno-deprecated-copy -Wno-undefined-var-template

View File

@ -71,7 +71,7 @@ TEST( PdmFieldSerialization, StringList )
&messages,
stringsAreQuoted );
EXPECT_EQ( 4, destination.size() );
EXPECT_EQ( size_t( 4 ), destination.size() );
}
//--------------------------------------------------------------------------------------------------
@ -92,7 +92,7 @@ TEST( PdmFieldSerialization, StringListQuoted )
&messages,
stringsAreQuoted );
EXPECT_EQ( 2, destination.size() );
EXPECT_EQ( (size_t)2, destination.size() );
EXPECT_STREQ( "B-2H", destination[0].toStdString().c_str() );
EXPECT_STREQ( "B-4H", destination[1].toStdString().c_str() );
}

View File

@ -10,7 +10,7 @@ endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEE_STRICT_CXX_FLAGS}")
if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-deprecated-declarations")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-deprecated-declarations -Wno-stringop-overflow")
endif()
set(CEE_HEADER_FILES

View File

@ -174,8 +174,6 @@ static bool ecl_nnc_data_set_values(ecl_nnc_data_type * data, const ecl_grid_typ
int current_grid1 = -1;
int current_grid2 = -1;
ecl_kw_type * current_kw = NULL;
int correct_kw_count = 0;
int kw_count = 0;
int nnc_size = ecl_nnc_geometry_size( nnc_geo );
for (int nnc_index = 0; nnc_index < nnc_size; nnc_index++) {
@ -187,17 +185,12 @@ static bool ecl_nnc_data_set_values(ecl_nnc_data_type * data, const ecl_grid_typ
current_grid1 = grid1;
current_grid2 = grid2;
current_kw = ecl_nnc_data_get_kw( grid, init_file, grid1 , grid2 , kw_type);
kw_count = 0;
if (current_kw) {
correct_kw_count = ecl_kw_get_size( current_kw );
}
else {
if (!current_kw) {
return false;
}
}
if (current_kw) {
data->values[nnc_index] = ecl_kw_iget_as_double(current_kw, pair->input_index);
kw_count++;
}
}

View File

@ -337,7 +337,6 @@ const char * ecl_util_file_type_name( ecl_file_enum file_type ) {
static bool valid_base(const char * input_base, bool * upper_case) {
bool upper = false;
bool lower = false;
const char * base = strrchr(input_base, UTIL_PATH_SEP_CHAR);
if (base == NULL)
base = input_base;
@ -347,10 +346,6 @@ static bool valid_base(const char * input_base, bool * upper_case) {
if (isupper(c))
upper = true;
if (islower(c))
lower = true;
}
if (upper_case)

View File

@ -5849,7 +5849,7 @@ namespace exprtk
return const_value_ptr(0);
}
std::size_t vector_size() const
std::size_t vector_size() const exprtk_override
{
return size_;
}