Fix compile errors and warnings on some compilers

.gitignore

@@ -0,0 +1,9 @@
+Makefile.inc
+dstar/Makefile.inc
+**/*.o
+**/*.a
+starev
+dstar/Normalisation
+dstar/SeBa
+**/*.data
+

Makefile

@@ -1,4 +1,4 @@
-CXXFLAGS  += -I./include -I./include/star -DHAVE_CONFIG_H -DTOOLBOX -Wconversion
+CXXFLAGS  += -I./include -I./include/star -DHAVE_CONFIG_H -Wconversion
 LDLIBS	  += -Lsstar -lsstar -Lnode -lnode -Lstd -lstd -lm
 CFLAGS    += -O
 CXXFLAGS  += -O
@@ -16,6 +16,12 @@ test:
 Makefile.inc:	Makefile.inc.conf
 	@sed s#__BASE__#$(PWD)#g Makefile.inc.conf >Makefile.inc
 
+starev.o: starev.C
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DTOOLBOX -c -o $@ $^
+
+starev: starev.o
+	$(CXX) -o $@ $(LDFLAGS) $< $(LDLIBS)
+
 lib:	Makefile.inc
 	@for d in $(DIRS) ; do echo '\nmake' $@ in $$d; make -C $$d $@ ; done
 

dstar/Makefile

@@ -1,6 +1,6 @@
 CXXFLAGS  += -I../include -I../include/star \
 	     -D_SRC_='"no_source_available"' \
-	     -DHAVE_CONFIG_H  -DTOOLBOX 
+	     -DHAVE_CONFIG_H
 LDLIBS	  += \
 	     -L. -ldstar \
 	     -L../sstar -lsstar \
@@ -17,6 +17,15 @@ DIRS	= init io starclass stardyn util
 
 all:	lib $(EXE)
 
+%.o: %.C
+	$(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) -DTOOLBOX -c $<
+
+SeBa: SeBa.o
+	$(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS)
+
+Normalisation: Normalisation.o
+	$(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS)
+
 Makefile.inc:	Makefile.inc.conf
 	@sed s#__BASE__#$(PWD)#g Makefile.inc.conf >Makefile.inc
 

dstar/SeBa.C

@@ -146,7 +146,7 @@ local bool  evolve_binary(dyn * bi,
                           real start_time, real end_time,
 			  bool stop_at_merger_or_disruption,
 			  bool stop_at_remnant_formation,
-			  char* SeBa_outfile) { 
+			  const char* SeBa_outfile) { 
 
 
   double_star* ds = dynamic_cast(double_star*, 
@@ -251,10 +251,9 @@ int main(int argc, char ** argv) {
     real start_time = 0;
     real end_time   = 13500;//35;
 
-    char* input_filename;
-    char* output_filename;
+    const char* input_filename;
+    const char* output_filename;
     output_filename = "SeBa.data";
-    //char output_filename = new char "SeBa.data";
 
     int input_seed=0; 
     char seedlog[64];

dstar/init/initdouble.C

@@ -641,7 +641,7 @@ void  adddouble(node * b, real dyn_time,
 		real e_min, real e_max)
 {
   if (REPORT_ADD_DOUBLE) {
-    int p = cerr.precision(HIGH_PRECISION);
+    std::streamsize p = cerr.precision(HIGH_PRECISION);
     cerr<<"adddouble: "<<b<<" "<<dyn_time;
     cerr.precision(p);
     cerr <<" "<<a_min<<" "<<a_max<<" "<<e_min<<" "<<e_max << endl;
@@ -701,7 +701,7 @@ cerr << "addstar(node... called from adddouble(node ..." << endl;
    }
 #else
 
-void main(int argc, char ** argv) {
+int main(int argc, char ** argv) {
 
     bool F_flag = false;
     bool P_flag = false;
@@ -820,7 +820,7 @@ void main(int argc, char ** argv) {
 			q_min, q_max, qf, q_exp, 
 			a_min, a_max, af, a_exp, 
 			e_min, e_max, ef, e_exp, 
-			m_prim, m_sec, sma, ecc);
+			m_prim, m_sec, sma, ecc, 1.0);
 	cerr << "\t" << m_prim 
 	     << "\t" << m_sec 
 	     << "\t" << sma

dstar/starclass/cluster_support.C

@@ -7,6 +7,8 @@
  *  make_profile --  make profile for whole n-binary cluster
  *-----------------------------------------------------------------------------
  */
+/* Disabled because make_profile in double_support.C is broken
+
 void  make_profile(initial_cluster& c_init,
                    cluster_profile& c_prof, profile prof,
                    star_type_spec s_prof = Emission) {
@@ -28,7 +30,8 @@ void  make_profile(initial_cluster& c_init,
           c_prof.enhance_cluster_profile(binary, prof, s_prof);
       }
 
-}    
+}
+*/
 
 /*-----------------------------------------------------------------------------
  *  cluster_profile -- Support routines for cluster simulation.

dstar/starclass/double_star.C

@@ -398,7 +398,7 @@ void double_star::dump(ostream & s, bool brief) {
   }
 }
 
-void double_star::dump(char * filename, bool brief) {
+void double_star::dump(const char * filename, bool brief) {
 
 
   ofstream s(filename, ios::app|ios::out);

dstar/starclass/double_support.C

@@ -198,9 +198,11 @@ void put_state(double_state d,
  *  make_profile --
  *-----------------------------------------------------------------------------
  */
+/* Disabled because get_new_binary returns NULL, so this is broken
 void  make_profile(int id, real start_time,
                    double_profile& binary, double_init& init) {
 
+
   cerr<<"double_support make_profile"<<endl;
   real dt = (init.end_time - start_time)/init.n_steps; 
 
@@ -233,6 +235,7 @@ void  make_profile(int id, real start_time,
   }
 
 }
+*/
 
 void double_profile::init_double_profile(double_star* b,
                                          star_state& p, star_state& s) {

dstar/starclass/triple_star.C

@@ -192,8 +192,8 @@ cerr<<"real double_star::add_mass_to_accretor(mdot="<<mdot
       real mdot_p = mdot*mtt_b/mtt_p;
       real mdot_s = mdot*mtt_b/mtt_s;
 
-      mdot_p = get_primary()->add_mass_to_accretor(mdot_p, dt, hydrogen);
-      mdot_s = get_secondary()->add_mass_to_accretor(mdot_s, dt, hydrogen);
+      mdot_p = get_primary()->add_mass_to_accretor(mdot_p, dt != 0.0, hydrogen);
+      mdot_s = get_secondary()->add_mass_to_accretor(mdot_s, dt != 0.0, hydrogen);
 
       real mdot_left = mdot - (mdot_p + mdot_s);
 

dstar/stardyn/adddouble.C

@@ -157,7 +157,7 @@ local void do_the_adding(hdyn *bi, real stellar_time,	// bi is binary CM
     }
 
     if (REPORT_ADD_DOUBLE) {
-	int p = cerr.precision(HIGH_PRECISION);
+	std::streamsize p = cerr.precision(HIGH_PRECISION);
 	cerr << "Before adddouble: at " << stellar_time << " to: ";
 	bi->pretty_print_tree(cerr);
 	cerr << " a=" << sma << " e=" << ecc << endl;
@@ -204,7 +204,7 @@ local void do_the_adding(hdyn *bi, real stellar_time,	// bi is binary CM
 	    new_double->set_star_story(old_story);
 
 	    if (REPORT_ADD_DOUBLE) {
-		int p = cerr.precision(HIGH_PRECISION);
+		std::streamsize p = cerr.precision(HIGH_PRECISION);
 		cerr<<"After adddouble: at "<<stellar_time<< " to: ";
 		new_double->dump(cerr);
 		od->get_kepler()->print_all(cerr);
@@ -231,7 +231,7 @@ void adddouble(hdyn *b,					// b is binary CM
 	       real e_min, real e_max)
 {
     if (REPORT_ADD_DOUBLE) {
-	int p = cerr.precision(HIGH_PRECISION);
+	std::streamsize p = cerr.precision(HIGH_PRECISION);
 	cerr<<"adddouble: "<<b<<" at T="<<dyn_time<<endl;
 	cerr.precision(p);
     }
@@ -315,7 +315,7 @@ void adddouble(hdyn *b,					// b is binary CM
  *  main  --
  *-----------------------------------------------------------------------------
  */
-main(int argc, char ** argv)
+int main(int argc, char ** argv)
     {
     int  c;
     bool  A_flag = FALSE;

dstar/stardyn/dstar_state.C

@@ -119,7 +119,7 @@ double_state make_state(dyn* b) {
 #else
 
 
-main() {
+int main() {
   cerr <<"Hello"<<endl;
 }