Skip to content

Commit

Permalink
Switching to cmath instead of math.h seems to help CentOS 7 builds.
Browse files Browse the repository at this point in the history
Suggests consideration of moving to more modern include forms. Also
maybe review and simplify include graph.
  • Loading branch information
michaelleerilee committed Sep 25, 2019
1 parent be36c80 commit 0917f15
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 7 deletions.
4 changes: 4 additions & 0 deletions NOTES
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@

* 2019-09-23 Version 0.8.2

Replacing math.h with cmath seems to help builds on CentOS 7 and later gcc.

* 2019-09-22 Version 0.8.1

Made change to STARE.h not STARE.h.in in 0.8.0 that
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.1
0.8.2
2 changes: 1 addition & 1 deletion include/General.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define INCLUDE_GENERAL_H_

#include <cstdint>
#include <math.h>
#include <cmath>

int firstBitDifferenceFromLeft(int64_t i0, int64_t i1);

Expand Down
3 changes: 2 additions & 1 deletion include/SpatialGeneral.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
TODO Explore using uint64 instead of uint32...
*/

#include <math.h>
//#include <math.h>
#include <cmath>
//#include <stdio.h>
//#include <iostream>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion include/SpatialIndex.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
//# Sept 9, 2002 : Gyorgy Fekete -- added setMaxlevel()
//#

#include <math.h>
#include <cmath>
#include <stdio.h>
#include <string.h>
#include <time.h>
Expand Down
3 changes: 2 additions & 1 deletion include/SpatialVector.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
//# Oct 18, 2001 : Dennis C. Dinge -- Replaced ValVec with std::vector
//#

#include <math.h>
//#include <math.h>
#include <cmath>
#include <stdio.h>
#include <iostream>
#include <SpatialGeneral.h>
Expand Down
2 changes: 1 addition & 1 deletion src/SpatialIndex.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#endif

#include <stdio.h>
#include <math.h>
#include <cmath>
// ===========================================================================
//
// Macro definitions for readability
Expand Down
2 changes: 1 addition & 1 deletion src/SpatialInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "SpatialInterface.h"
#include "string.h"
#include "stdlib.h"
#include "math.h"
#include <cmath>
#include <iomanip> // setw

#define MAX_RANGES 100
Expand Down

0 comments on commit 0917f15

Please sign in to comment.