Skip to content

Commit bab97ed

Browse files
committed
Corrected calculations for Hurley A(n) and B(n) coefficients (see Hurley et al. 2000, appendix); Changed utils::GetGSLVersion() to avoid compiler warning 'warning: ignoring attributes on template argument ‘int (*)(FILE*)’ [-Wignored-attributes]'; Reverted Makefile line 'SOURCES := ' to listing actual source files
1 parent 30e0328 commit bab97ed

File tree

3 files changed

+53
-2
lines changed

3 files changed

+53
-2
lines changed

src/Makefile

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,56 @@ endif
1919

2020
# Common variables for both builds
2121
EXE := $(BDIR)/COMPAS
22-
SOURCES := $(wildcard *.cpp)
22+
23+
SOURCES := \
24+
profiling.cpp \
25+
utils.cpp \
26+
yaml.cpp \
27+
vector3d.cpp \
28+
\
29+
Rand.cpp \
30+
Options.cpp \
31+
Log.cpp \
32+
Errors.cpp \
33+
\
34+
BaseStar.cpp \
35+
\
36+
Star.cpp \
37+
\
38+
MainSequence.cpp \
39+
MS_lte_07.cpp \
40+
MS_gt_07.cpp \
41+
\
42+
CH.cpp \
43+
\
44+
GiantBranch.cpp \
45+
HG.cpp \
46+
FGB.cpp \
47+
CHeB.cpp \
48+
EAGB.cpp \
49+
TPAGB.cpp \
50+
\
51+
HeMS.cpp \
52+
HeHG.cpp \
53+
HeGB.cpp \
54+
\
55+
Remnants.cpp \
56+
\
57+
WhiteDwarfs.cpp \
58+
HeWD.cpp \
59+
COWD.cpp \
60+
ONeWD.cpp \
61+
\
62+
NS.cpp \
63+
BH.cpp \
64+
MR.cpp \
65+
\
66+
BinaryConstituentStar.cpp \
67+
BaseBinaryStar.cpp \
68+
BinaryStar.cpp \
69+
\
70+
main.cpp
71+
2372
OBJS := $(patsubst %.cpp,$(ODIR)/%.o,$(SOURCES))
2473

2574
# GSL, Boost, and HDF5 directories

src/changelog.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1657,6 +1657,8 @@
16571657
// - Added KLENCKI_LINEAR AM loss, which is linear in the specific AM gamma instead of the orbital separation (as in MACLEOD_LINEAR)
16581658
// 03.25.01 JR - August 20, 2025 - Defect repairs:
16591659
// - Corrected calculations for Hurley A(n) and B(n) coefficients (see Hurley et al. 2000, appendix)
1660+
// - Changed utils::GetGSLVersion() to avoid compiler warning "warning: ignoring attributes on template argument ‘int (*)(FILE*)’ [-Wignored-attributes]"
1661+
// - Reverted Makefile line "SOURCES := $(wildcard *.cpp)" to listing actual source files
16601662
//
16611663
// Version string format is MM.mm.rr, where
16621664
//

src/utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1836,7 +1836,7 @@ namespace utils {
18361836
std::string versionStr = "Not available"; // default return value
18371837

18381838
char buffer[128]; // command return buffer
1839-
std::unique_ptr<FILE, decltype(&pclose)> pipe(popen("gsl-config --version", "r"), pclose); // open pipe for command
1839+
std::unique_ptr<FILE, int(*)(FILE*)> pipe(popen("gsl-config --version", "r"), &pclose); // open pipe for command
18401840
if (pipe) { // ok?
18411841
versionStr = ""; // yes
18421842
while (fgets(buffer, sizeof(buffer), pipe.get()) != nullptr) versionStr += buffer; // copy buffer

0 commit comments

Comments
 (0)