added newlines for CRAN

src/phreeqcpp/ChartObject.cpp

@@ -1379,4 +1379,4 @@ const std::vector< std::string >::value_type temp_vopts[] = {
 const std::vector< std::string > ChartObject::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);
 
 
-#endif // MULTICHART
+#endif // MULTICHART

src/phreeqcpp/CurveObject.cpp

@@ -39,4 +39,4 @@ CurveObject::~CurveObject()
 {
 }
 
-#endif // MULTICHART
+#endif // MULTICHART

src/phreeqcpp/ExchComp.cxx

@@ -395,4 +395,4 @@ const std::vector< std::string >::value_type temp_vopts[] = {
 	std::vector< std::string >::value_type("totals"),	            // 8
 	std::vector< std::string >::value_type("formula_totals")	    // 9	
 };									   
-const std::vector< std::string > cxxExchComp::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);
+const std::vector< std::string > cxxExchComp::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);

src/phreeqcpp/ISolutionComp.cxx

@@ -199,4 +199,4 @@ read(const char *line_in, cxxSolution *solution_ptr)
 	}
 	return (CParser::PARSER_OK);
 
-}
+}

src/phreeqcpp/NA.h

@@ -1 +1 @@
-#define NA -98.7654321
+#define NA -98.7654321

src/phreeqcpp/PhreeqcKeywords/Keywords.h

@@ -96,4 +96,4 @@ public:
 	static const std::map<KEYWORDS, const std::string> phreeqc_keyword_names;
 };
 
-#endif // _INC_KEYWORDS_H
+#endif // _INC_KEYWORDS_H

src/phreeqcpp/Pressure.cxx

@@ -414,4 +414,4 @@ const std::vector< std::string >::value_type temp_vopts[] = {
 	std::vector< std::string >::value_type("equal_increments"),	    //1
 	std::vector< std::string >::value_type("count") 	            //2
 };									   
-const std::vector< std::string > cxxPressure::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);	
+const std::vector< std::string > cxxPressure::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);	

src/phreeqcpp/Reaction.cxx

@@ -281,4 +281,4 @@ const std::vector< std::string >::value_type temp_vopts[] = {
 	std::vector< std::string >::value_type("equal_increments"),	//4
 	std::vector< std::string >::value_type("count_steps") 	    //5
 };									   
-const std::vector< std::string > cxxReaction::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);	
+const std::vector< std::string > cxxReaction::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);	

src/phreeqcpp/SS.cxx

@@ -606,4 +606,4 @@ const std::vector< std::string >::value_type temp_vopts[] = {
 	std::vector< std::string >::value_type("totals"),       //16
 	std::vector< std::string >::value_type("dn")            //17
 };									   
-const std::vector< std::string > cxxSS::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);	
+const std::vector< std::string > cxxSS::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);	

src/phreeqcpp/SScomp.cxx

@@ -294,4 +294,4 @@ const std::vector< std::string >::value_type temp_vopts[] = {
 	std::vector< std::string >::value_type("dnc"),	            // 9
 	std::vector< std::string >::value_type("dnb") 	            // 10
 };									   
-const std::vector< std::string > cxxSScomp::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);	
+const std::vector< std::string > cxxSScomp::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);	

src/phreeqcpp/Serializer.h

@@ -39,4 +39,4 @@ protected:
 	//std::string words_string;
 	Dictionary dictionary;
 };
-#endif // !defined(SERIALIZER_H_INCLUDED)
+#endif // !defined(SERIALIZER_H_INCLUDED)

src/phreeqcpp/Solution.cxx

@@ -1754,4 +1754,4 @@ const std::vector< std::string >::value_type temp_vopts[] = {
 	std::vector< std::string >::value_type("potential"), 	                        // 26
 	std::vector< std::string >::value_type("log_molalities_map")                    // 27
 };									   
-const std::vector< std::string > cxxSolution::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);	
+const std::vector< std::string > cxxSolution::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);	

src/phreeqcpp/SurfaceCharge.cxx

@@ -583,4 +583,4 @@ const std::vector< std::string >::value_type temp_vopts[] = {
 	std::vector< std::string >::value_type("g_map"),	            // 15
 	std::vector< std::string >::value_type("diffuse_layer_species") // 16
 };									   
-const std::vector< std::string > cxxSurfaceCharge::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);	
+const std::vector< std::string > cxxSurfaceCharge::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);	

src/phreeqcpp/Temperature.cxx

@@ -420,4 +420,4 @@ const std::vector< std::string >::value_type temp_vopts[] = {
 	std::vector< std::string >::value_type("equal_increments"),	//1
 	std::vector< std::string >::value_type("count_temps") 	    //2
 };									   
-const std::vector< std::string > cxxTemperature::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);	
+const std::vector< std::string > cxxTemperature::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);	

src/phreeqcpp/UserPunch.h

@@ -36,4 +36,4 @@ protected:
 	class rate *             rate;
 	Phreeqc *                 PhreeqcPtr;
 };
-#endif // !defined(USERPUNCH_H_INCLUDED)
+#endif // !defined(USERPUNCH_H_INCLUDED)

src/phreeqcpp/common/PHRQ_base.cxx

@@ -114,4 +114,4 @@ echo_msg(const std::string & stdstr)
 		std::cout << stdstr << "\n";
 #endif
 	}
-}
+}

src/phreeqcpp/common/Parser.cxx

@@ -1328,4 +1328,4 @@ CParser::TOKEN_TYPE CParser::parse_delimited(std::string & source, std::string &
 	std::string str = result;
 
 	return token_type(trim_left(str));
-}
+}

src/phreeqcpp/cxxMix.cxx

@@ -151,4 +151,4 @@ void cxxMix::Vectorize(std::vector<int> &n, std::vector<LDBLE> &f)
 		f.push_back(it->second);
 	}
 }
-const std::vector< std::string > cxxMix::vopts;
+const std::vector< std::string > cxxMix::vopts;

src/phreeqcpp/global_structures.h

@@ -1650,4 +1650,4 @@ public:
 	LDBLE uncertainty;
 };
 
-#endif /* _INC_GLOBAL_STRUCTURES_H  */
+#endif /* _INC_GLOBAL_STRUCTURES_H  */

src/phreeqcpp/pitzer.cpp

@@ -2704,4 +2704,4 @@ pitzer_make_lists(void)
 		}
 		param_list.push_back(i);
 	}
-}
+}

src/phreeqcpp/sit.cpp

@@ -1683,4 +1683,4 @@ sit_make_lists(void)
 		if (sit_IPRSNT[i0] == FALSE || sit_IPRSNT[i1] == FALSE) continue;
 		param_list.push_back(i);
 	}
-}
+}

src/phreeqcpp/transport.cpp

@@ -6180,4 +6180,4 @@ flux_mcd(const char* species_name, int option)
 		}
 	}
 	return (f);
-}
+}