Skip to content

Two minor fixes necessary for successful compilation with g++15 #158

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

Merged
michael-petersen merged 2 commits into from
Sep 29, 2025
Merged

Two minor fixes necessary for successful compilation with g++15 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cb741d
Two minor fixes necessary for successful compilation with g++15
Aug 25, 2025
3989537
Set explicit C-language standard for Clang
Aug 25, 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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ project(
LANGUAGES C CXX Fortran)

set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
set(CMAKE_C_STANDARD 17)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_EXTENSIONS OFF)

Expand Down
1 change: 1 addition & 0 deletions expui/ParticleIterator.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <ParticleReader.H>
#include <functional>
#include <cstdint>

namespace Utility
{
Expand Down
11 changes: 4 additions & 7 deletions exputil/GaussCore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include <stdio.h> /* for error messages */
#include <stdlib.h>
#include <stdbool.h>
#include "GaussCore.h"

#define GaussEPS 1.0e-12
Expand Down Expand Up @@ -56,15 +57,13 @@ static int n1;
void GaussMaster(int n, double alpha, double beta, int conflag,
double abscis[], double weight[])
{
#define FALSE 0
#define TRUE 1
typedef int bool;
int k, m;
int below;
double t, min, max, Glob;
double delta, Qp;
double temp;
bool ok;

#define junk1 &delta
#define junk2 &Qp

Expand Down Expand Up @@ -170,7 +169,7 @@ void GaussMaster(int n, double alpha, double beta, int conflag,
-Desirable improvement:
include machine roundoff in equality tests.
*/
ok= FALSE;
ok= false;
do {
if (Qp==0) break;
delta/= -Qp;
Expand All @@ -182,7 +181,7 @@ void GaussMaster(int n, double alpha, double beta, int conflag,
delta*= (1+t);
}
ok = (min <= temp) && (temp <= max);
} while (FALSE);
} while (false);

if (ok) t=temp; /* use Newton iterate... */
else t= (min + max)/2; /* ...or bisect to recover */
Expand All @@ -197,8 +196,6 @@ void GaussMaster(int n, double alpha, double beta, int conflag,
}
#undef junk1
#undef junk2
#undef TRUE
#undef FALSE
}


Expand Down
1 change: 1 addition & 0 deletions include/cxxopts.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ THE SOFTWARE.

#include <cctype>
#include <cstring>
#include <cstdint>
#include <exception>
#include <iostream>
#include <limits>
Expand Down