Skip to content

Fix C++20 template-id errors in constructors/destructors #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
saberger wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix C++20 template-id errors in constructors/destructors #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1c8673
Fixed compatibility issue
saberger Oct 29, 2025
b00f42b
fix
saberger Oct 29, 2025
55e36dc
Fixed C++20 errors
saberger Oct 29, 2025
7e94926
Fixed release mode compilation
saberger Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions source/src/core/scoring/lkball/LK_DomeEnergy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,15 +1034,14 @@ cubed_root( Real val ) {


DerivativeFinderWadj::DerivativeFinderWadj( Vector const & base, Vector const & water, Real w_dist, Real water_adjust )
: x(14)
: B( base ),
W( water ),
B_to_W( water - base ),
wadj( water_adjust ),
w_dist_( w_dist ),
x(14)
{

w_dist_ = w_dist;
wadj = water_adjust;

B = base;
W = water;
B_to_W = W - B;
B_to_W_norm = B_to_W.norm();
B_to_W_norm2 = B_to_W_norm*B_to_W_norm;
B_to_W_norm3 = B_to_W_norm2*B_to_W_norm;
Expand Down Expand Up @@ -1098,21 +1097,19 @@ DerivativeFinderWadj::dWadj_dWater() {

DerivativeFinder::DerivativeFinder( Vector const & base, Vector const & water, Vector const & other,
Real min_cose, Real min_sine, Real max_cose, Real max_sine, Real w_dist, Real water_adjust ) :
B(base),
W(water),
Ot(other),
W_to_Ot(Ot - W),
B_to_W(W - B),
w_dist_( w_dist ),
wadj( water_adjust ),
x(175)
{
w_dist_ = w_dist;
wadj = water_adjust;

B = base;
W = water;
Ot = other;

W_to_Ot = Ot - W;
W_to_Ot_norm = W_to_Ot.norm();
W_to_Ot_norm2 = W_to_Ot_norm*W_to_Ot_norm;
W_to_Ot_norm3 = W_to_Ot_norm*W_to_Ot_norm2;

B_to_W = W - B;
B_to_W_norm = B_to_W.norm();
B_to_W_norm2 = B_to_W_norm*B_to_W_norm;
B_to_W_norm3 = B_to_W_norm2*B_to_W_norm;
Expand Down
8 changes: 4 additions & 4 deletions source/src/numeric/MathMatrix.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public:
//////////////////////////////////

/// @brief default constructor
MathMatrix< T>() :
MathMatrix() :
NumberRows_( 0),
NumberCols_( 0),
size_( 0 ),
Expand All @@ -79,7 +79,7 @@ public:
/// @param NUMBER_ROWS number of rows in matrix
/// @param NUMBER_COLS number of cols in matrix
/// @param FILL_VALUE assign every element to that value
explicit MathMatrix< T>
explicit MathMatrix
(
const Size NUMBER_ROWS,
const Size NUMBER_COLS,
Expand All @@ -98,7 +98,7 @@ public:
/// @param NUMBER_ROWS number of rows in matrix
/// @param NUMBER_COLS number of cols in matrix
/// @param DATA pointer to field of data
MathMatrix< T>
MathMatrix
(
const Size NUMBER_ROWS,
const Size NUMBER_COLS,
Expand Down Expand Up @@ -133,7 +133,7 @@ public:
}

/// @brief destructor
~MathMatrix< T>()
~MathMatrix()
{
delete[] data_;
}
Expand Down
10 changes: 5 additions & 5 deletions source/src/numeric/MathVector.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public:
//////////////////////////////////

/// @brief default constructor
MathVector< T>() :
MathVector() :
size_( 0),
data_( nullptr )
{
Expand All @@ -81,7 +81,7 @@ public:
/// @brief construct from size and possible filler
/// @param SIZE number fo elements in Vector
/// @param FILL_VALUE assign every element to that value
explicit MathVector< T>( const Size SIZE, const T &FILL_VALUE= T( 0)) :
explicit MathVector( const Size SIZE, const T &FILL_VALUE= T( 0)) :
size_( SIZE),
data_( new T[ SIZE])
{
Expand All @@ -91,7 +91,7 @@ public:
}

/// @brief construct from length and pointer to data
MathVector< T>( const Size SIZE, const T *DATA) :
MathVector( const Size SIZE, const T *DATA) :
size_( SIZE),
data_( new T[ SIZE])
{
Expand All @@ -110,13 +110,13 @@ public:

/// @brief Clone function
/// @return pointer to new Vector< T>
MathVector< T> *clone() const
MathVector *clone() const
{
return new MathVector< T>( *this);
}

/// @ brief destructor
~MathVector< T>()
~MathVector()
{
delete[] data_;
}
Expand Down
2 changes: 1 addition & 1 deletion source/src/numeric/histograms/OneDHistogram.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class OneDHistogram {

public:

OneDHistogram<key1>()= default;
OneDHistogram()= default;

void insert_data(key1 key_1, platform::Size counts){
histogram_.insert(std::make_pair(key_1, counts));
Expand Down
2 changes: 1 addition & 1 deletion source/src/protocols/forge/remodel/RemodelGlobalFrame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ void RemodelGlobalFrame::get_helical_params( core::pose::Pose & pose ) {
Matrix3f I = Matrix3f::Identity();
Matrix3f N = 0.5*(H+H.transpose()) - cos(omega)*I;

Vector3f hN;
Vector3f hN{0.0, 0.0, 0.0};
Real scalar = 0;
Real max_scalar = -10000000;
for ( core::Size i = 0; i<=2; i++ ) {
Expand Down
11 changes: 1 addition & 10 deletions source/src/utility/options/VectorOption_T_.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,8 @@ protected: // Creation


/// @brief Copy constructor
inline
VectorOption_T_( VectorOption_T_ const & option ) :
Super( option )
#ifdef VECTOROPTION_T_FULL_THREAD_SAFETY
,
mutex_()
#endif
{
(*this) = option;
}

VectorOption_T_( VectorOption_T_ const & option ) = default;

/// @brief Key + description constructor
inline
Expand Down
6 changes: 3 additions & 3 deletions source/test/core/fragment/ConstantLengthFragments.cxxtest.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,11 @@ void FragmentConstantLengthTest::test_frag_iterator() {
FrameList frames;
if ( fragset.region( movemap, pos, pos, len, len, frames ) ) {
Frame const& frame ( * ( frames[ 1 ] ) );
Size val;
Size val = 0;
TS_ASSERT( silly_cache.retrieve(frame, 1, val) ); //there should be a value ( return true )
TS_ASSERT_EQUALS( val , pos );

Size val2;
Size val2 = 999555; // Something non-zero;
TS_ASSERT( it != eit );
TS_ASSERT( silly_cache.retrieve( **it , 1, val2) ); //there should be a value ( return true )
TS_ASSERT_EQUALS( val2 , val );
Expand All @@ -285,7 +285,7 @@ void FragmentConstantLengthTest::test_frag_iterator() {
ConstFrameIterator it = bfragset.begin();
ConstFrameIterator eit= bfragset.end();
for ( Size pos=1 ; it!=eit; ++it ) {
Size val;
Size val = 0;
silly_cache.retrieve( **it, 1, val);
TS_ASSERT_EQUALS( val, pos );
++pos;
Expand Down
4 changes: 2 additions & 2 deletions source/test/utility/UTools.cxxtest.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ public:
// ------------------------------------------ //
/// @brief test isMarkup function
void test_isMarkup() {
double num;
unsigned int end_pos;
double num = 0.0;
unsigned int end_pos = 0;
bool res;

res = test::utools::isMarkup("something(1.23)", 0, num, end_pos, "MARKUP(");
Expand Down
10 changes: 10 additions & 0 deletions source/tools/build/basic.settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,16 @@ settings = {
},
},

"gcc, |cxx_ver:>=15.0|" : {
"appends" : {
"flags" : {
"warn" : [
"Wno-error=dangling-pointer=", # Boost spirit issue
],
},
},
},

"gcc, |cxx_ver:>=13.0|" : {
"appends" : {
"flags" : {
Expand Down