Merge pull request #30 from rieder/issue-29

Fix for issue #29

Author: silviatoonen

Makefile

@@ -1,4 +1,4 @@
-CXXFLAGS  += -I./include -I./include/star -DHAVE_CONFIG_H -DTOOLBOX
+CXXFLAGS  += -I./include -I./include/star -DHAVE_CONFIG_H -DTOOLBOX -Wconversion
 LDLIBS	  += -Lsstar -lsstar -Lnode -lnode -Lstd -lstd -lm
 CFLAGS    += -O
 CXXFLAGS  += -O

Makefile.inc.conf

@@ -1,7 +1,7 @@
 CXXFLAGS  += -I__BASE__/include -I__BASE__/include/star -DHAVE_CONFIG_H
-CFLAGS    +=	-O
-CXXFLAGS  +=	-O
+CFLAGS    +=	-O -Wconversion # -Werror=conversion
+CXXFLAGS  +=	-O -Wconversion # -Werror=conversion
 
 
 
-CXXFLAGS += -D_SRC_='"no_source_available"'
+CXXFLAGS += -D_SRC_='"no_source_available"'

include/stdinc.h

@@ -134,6 +134,7 @@ using std::flush;
 using std::min; 
 using std::max; 
 using std::ios; 
+using std::abs;
 
 //=============================================================================
 //  New naming conventions to add to or replace existing names in C :

sstar/starclass/single_star.C

@@ -3124,7 +3124,7 @@ real single_star::update_core_and_envelope_mass(const real m_core) {
 
   bool successful_update = false;
   real dm_core = m_core-core_mass;
-    
+  
   if (m_core > get_total_mass()){
     cerr << "single_star::update_core_and_envelope_mass limits new core mass to total mass." << endl;
     real m_tot = get_total_mass();
@@ -3261,7 +3261,7 @@ real single_star::linear_function_inversion(real (single_star::*fptr)(real, cons
         gx = gx_new; 
         within_range = 1; 
     }
-    while(abs(dy/y_value)>cnsts.safety(minimum_inversion_precision));
+    while(std::abs(dy/y_value)>cnsts.safety(minimum_inversion_precision));
 
 //    PRC(x_guess);PRL(gx);
 //    PRC(y_value);PRL((this->*fptr)(gx, z));