From ca57125e510df958a35a07c8d7fceebe86c46e43 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Thu, 12 Aug 2021 13:59:38 +0100
Subject: [PATCH] fix other COMENV_WANG_2016 typos
---
doc/make_html2.pl | 9 ++++++---
src/binary_c_structures.h | 2 +-
src/memory/clean_tmpstore.c | 4 ++--
src/memory/free_store_contents.c | 2 +-
src/memory/free_tmpstore.c | 2 +-
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/doc/make_html2.pl b/doc/make_html2.pl
index b270a25e7..040cfdb9c 100755
--- a/doc/make_html2.pl
+++ b/doc/make_html2.pl
@@ -2,6 +2,9 @@
use strict;
use rob_misc;
use warnings;
+print "DEPRECATED : use make_html.pl\n";
+exit;
+
# make binary_c's HTML manual
@@ -42,7 +45,7 @@ while(1)
# same for libbinary_c
$html =~s !<math xmlns=\"http\:\/\/www.w3.org\/1998\/Math\/MathML\">\s*<mrow>\s*(?:<mstyle mathvariant=\'normal\'>)?\s*<mstyle mathvariant=\'italic\'>\s*<mrow>(<mi>l<\/mi><mi>i<\/mi><mi>b<\/mi>)?<mi>([Bb])<\/mi><mi>i<\/mi><mi>n<\/mi><mi>a<\/mi><mi>r<\/mi><mi>y<\/mi>_<mi>c<\/mi>\s*<\/mrow>\s*(?:<\/mstyle>\s*)?<\/mstyle>\s*<\/mrow><\/math>!$1$2inary_c!gs;
use warnings;
-
+
# this does not work!
$html =~s !<math xmlns=\"http\:\/\/www.w3.org\/1998\/Math\/MathML\">\s*<mrow>\s*<mstyle mathvariant='normal'>\s*<mstyle mathvariant='italic'>\s*<mrow><mi>b<\/mi><mi>i<\/mi><mi>n<\/mi><mi>a<\/mi><mi>r<\/mi><mi>y<\/mi>_<mi>g<\/mi><mi>r<\/mi><mi>i<\/mi><mi>d<\/mi>\s*<\/mrow>\s*<\/mstyle>\s*<\/mstyle>\s*<\/mrow><\/math>!binary_grid!gs;
@@ -94,10 +97,10 @@ while(1)
# DONE
print "\n\nDone! (refresh the page now)\n\n\n";
-
+
if($watch)
{
- # check for when size changes
+ # check for when size changes
my $size = -s $lyxfile;
my $modtime = -M $lyxfile;
while($size == -s $lyxfile &&
diff --git a/src/binary_c_structures.h b/src/binary_c_structures.h
index 9cb603b1c..1739c0aed 100644
--- a/src/binary_c_structures.h
+++ b/src/binary_c_structures.h
@@ -328,7 +328,7 @@ struct store_t {
*tableb1,*tableb2,*tableb3,
*tableg1,*tableg2,*tableg3;
struct data_table_t * comenv_maxR_table;
-#endif//COMENV_WANG_2016
+#endif//COMENV_WANG2016
#ifdef COMENV_POLYTROPES
struct data_table_t * comenv_polytrope_2d;
struct data_table_t * comenv_polytrope_3d;
diff --git a/src/memory/clean_tmpstore.c b/src/memory/clean_tmpstore.c
index 78526f3f5..1c8e3efd2 100644
--- a/src/memory/clean_tmpstore.c
+++ b/src/memory/clean_tmpstore.c
@@ -40,8 +40,8 @@ void clean_tmpstore(struct tmpstore_t * RESTRICT const tmpstore)
}
#endif//NUCSYN
-#ifdef COMENV_WANG_2016
- //Delete_data_table(tmpstore->comenv_lambda_table);
+#ifdef COMENV_WANG2016
+ Delete_data_table(tmpstore->comenv_lambda_table);
#endif
#ifdef WTTS_LOG
{
diff --git a/src/memory/free_store_contents.c b/src/memory/free_store_contents.c
index 4194c4561..4e267c9ac 100644
--- a/src/memory/free_store_contents.c
+++ b/src/memory/free_store_contents.c
@@ -53,7 +53,7 @@ void free_store_contents(struct store_t * RESTRICT const store)
Delete_data_table(store->carrasco2014_cooling_table5);
binary_magnitudes_free_memory(store);
#endif // STELLAR_COLOURS
-#ifdef COMENV_WANG_2016
+#ifdef COMENV_WANG2016
Store_free(tableh1);
Store_free(tableh2);
Store_free(tableh3);
diff --git a/src/memory/free_tmpstore.c b/src/memory/free_tmpstore.c
index 7322c337f..aaa2a0548 100644
--- a/src/memory/free_tmpstore.c
+++ b/src/memory/free_tmpstore.c
@@ -79,7 +79,7 @@ void free_tmpstore(struct tmpstore_t * RESTRICT const tmpstore,
}
#endif//NUCSYN
-#ifdef COMENV_WANG_2016
+#ifdef COMENV_WANG2016
//Tmp_free(comenv_lambda_data);
Delete_data_table(tmpstore->comenv_lambda_table);
#endif
--
GitLab