Skip to content

Commit 078f90d

Browse files
authored
fix: remove sfinae in wrapperHelpers::resizeDefault function. (#3630)
* remove sfinae in wrapperHelpers::resizeDefault function. * modify the setuypPythonEnvironment.bash
1 parent 4aa2c9f commit 078f90d

File tree

3 files changed

+11
-28
lines changed

3 files changed

+11
-28
lines changed

scripts/setupPythonEnvironment.bash

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ PACKAGE_BRANCH=main
1414
declare -a TARGET_PACKAGES=("geos-mesh"
1515
"geos-xml-tools"
1616
"hdf5-wrapper"
17+
"geos-utils"
18+
"geos-mesh"
1719
"pygeos-tools"
1820
"geos-ats")
1921
declare -a LINK_SCRIPTS=("preprocess_xml"

src/coreComponents/dataRepository/Wrapper.hpp

+8-1
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,14 @@ class Wrapper final : public WrapperBase
411411
virtual void resize( localIndex const newSize ) override
412412
{
413413
wrapperHelpers::move( *m_data, hostMemorySpace, true );
414-
wrapperHelpers::resizeDefault( reference(), newSize, m_default, this->getName() );
414+
if constexpr ( traits::HasMemberFunction_resizeDefault< T > && DefaultValue< T >::has_default_value )
415+
{
416+
wrapperHelpers::resizeDefault( reference(), newSize, m_default, this->getName() );
417+
}
418+
else
419+
{
420+
wrapperHelpers::resize( reference(), newSize );
421+
}
415422
}
416423

417424
/// @cond DO_NOT_DOCUMENT

src/coreComponents/dataRepository/wrapperHelpers.hpp

+1-27
Original file line numberDiff line numberDiff line change
@@ -190,39 +190,13 @@ resize( T & GEOS_UNUSED_PARAM( value ),
190190
{}
191191

192192
template< typename T >
193-
inline std::enable_if_t< traits::HasMemberFunction_resizeDefault< T > &&
194-
DefaultValue< T >::has_default_value >
193+
inline void
195194
resizeDefault( T & value,
196195
localIndex const newSize,
197196
DefaultValue< T > const & defaultValue,
198197
string const & )
199198
{ value.resizeDefault( newSize, defaultValue.value ); }
200199

201-
template< typename T >
202-
inline std::enable_if_t< !( traits::HasMemberFunction_resizeDefault< T > &&
203-
DefaultValue< T >::has_default_value ) >
204-
resizeDefault( T & value,
205-
localIndex const newSize,
206-
DefaultValue< T > const & GEOS_UNUSED_PARAM( defaultValue ),
207-
string const & name )
208-
{
209-
#if !defined(NDEBUG)
210-
GEOS_LOG_RANK_0( GEOS_FMT( "Warning: For Wrapper<{}>::name() = {}:\n"
211-
" wrapperHelpers::resizeDefault<{}>() called, but the SFINAE filter failed:\n"
212-
" traits::HasMemberFunction_resizeDefault< {} > = {}\n "
213-
" DefaultValue< {} >::has_default_value = {}",
214-
LvArray::system::demangleType< T >(),
215-
name,
216-
LvArray::system::demangleType< T >(),
217-
LvArray::system::demangleType< T >(),
218-
traits::HasMemberFunction_resizeDefault< T >,
219-
LvArray::system::demangleType< T >(),
220-
DefaultValue< T >::has_default_value ) );
221-
#else
222-
GEOS_UNUSED_VAR( name );
223-
#endif
224-
resize( value, newSize );
225-
}
226200

227201

228202
template< typename T, int NDIM, typename PERMUTATION >

0 commit comments

Comments
 (0)