From 013c822f76e5dc2e4fc19e87c6e5777aea6151d2 Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R" Date: Thu, 23 Sep 2021 06:37:13 -0700 Subject: [PATCH 1/2] added newlines for CRAN --- PHRQ_base.cxx | 2 +- Parser.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PHRQ_base.cxx b/PHRQ_base.cxx index f2c164c2..6e48faaa 100644 --- a/PHRQ_base.cxx +++ b/PHRQ_base.cxx @@ -114,4 +114,4 @@ echo_msg(const std::string & stdstr) std::cout << stdstr << "\n"; #endif } -} \ No newline at end of file +} diff --git a/Parser.cxx b/Parser.cxx index 0469142b..db7d3556 100644 --- a/Parser.cxx +++ b/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)); -} \ No newline at end of file +} From c1af6f3585142e84fc40ec2c74914ef4a3b5da8b Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R" Date: Thu, 23 Sep 2021 06:37:13 -0700 Subject: [PATCH 2/2] added newlines for CRAN --- ChartObject.cpp | 2 +- CurveObject.cpp | 2 +- ExchComp.cxx | 2 +- ISolutionComp.cxx | 2 +- NA.h | 2 +- PhreeqcKeywords/Keywords.h | 2 +- Pressure.cxx | 2 +- Reaction.cxx | 2 +- SS.cxx | 2 +- SScomp.cxx | 2 +- Serializer.h | 2 +- Solution.cxx | 2 +- SurfaceCharge.cxx | 2 +- Temperature.cxx | 2 +- UserPunch.h | 2 +- common/PHRQ_base.cxx | 2 +- common/Parser.cxx | 2 +- cxxMix.cxx | 2 +- global_structures.h | 2 +- pitzer.cpp | 2 +- sit.cpp | 2 +- transport.cpp | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ChartObject.cpp b/ChartObject.cpp index d6ab781b..9d6513ce 100644 --- a/ChartObject.cpp +++ b/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 \ No newline at end of file +#endif // MULTICHART diff --git a/CurveObject.cpp b/CurveObject.cpp index 53410bdf..91e1e29c 100644 --- a/CurveObject.cpp +++ b/CurveObject.cpp @@ -39,4 +39,4 @@ CurveObject::~CurveObject() { } -#endif // MULTICHART \ No newline at end of file +#endif // MULTICHART diff --git a/ExchComp.cxx b/ExchComp.cxx index 89f47536..4072e49c 100644 --- a/ExchComp.cxx +++ b/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]); \ No newline at end of file +const std::vector< std::string > cxxExchComp::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]); diff --git a/ISolutionComp.cxx b/ISolutionComp.cxx index 81c57514..d9fd455f 100644 --- a/ISolutionComp.cxx +++ b/ISolutionComp.cxx @@ -199,4 +199,4 @@ read(const char *line_in, cxxSolution *solution_ptr) } return (CParser::PARSER_OK); -} \ No newline at end of file +} diff --git a/NA.h b/NA.h index 7f1afa93..3222c6cb 100644 --- a/NA.h +++ b/NA.h @@ -1 +1 @@ -#define NA -98.7654321 \ No newline at end of file +#define NA -98.7654321 diff --git a/PhreeqcKeywords/Keywords.h b/PhreeqcKeywords/Keywords.h index 7c5e3740..f812fb39 100644 --- a/PhreeqcKeywords/Keywords.h +++ b/PhreeqcKeywords/Keywords.h @@ -96,4 +96,4 @@ public: static const std::map phreeqc_keyword_names; }; -#endif // _INC_KEYWORDS_H \ No newline at end of file +#endif // _INC_KEYWORDS_H diff --git a/Pressure.cxx b/Pressure.cxx index 71e80783..a5075b0d 100644 --- a/Pressure.cxx +++ b/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]); \ No newline at end of file +const std::vector< std::string > cxxPressure::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]); diff --git a/Reaction.cxx b/Reaction.cxx index 83d1eb64..511e3719 100644 --- a/Reaction.cxx +++ b/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]); \ No newline at end of file +const std::vector< std::string > cxxReaction::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]); diff --git a/SS.cxx b/SS.cxx index 9f65068c..bee411af 100644 --- a/SS.cxx +++ b/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]); \ No newline at end of file +const std::vector< std::string > cxxSS::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]); diff --git a/SScomp.cxx b/SScomp.cxx index d3ac5761..5b7b136f 100644 --- a/SScomp.cxx +++ b/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]); \ No newline at end of file +const std::vector< std::string > cxxSScomp::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]); diff --git a/Serializer.h b/Serializer.h index 80c285d8..f468dd47 100644 --- a/Serializer.h +++ b/Serializer.h @@ -39,4 +39,4 @@ protected: //std::string words_string; Dictionary dictionary; }; -#endif // !defined(SERIALIZER_H_INCLUDED) \ No newline at end of file +#endif // !defined(SERIALIZER_H_INCLUDED) diff --git a/Solution.cxx b/Solution.cxx index 85055223..cb2d2941 100644 --- a/Solution.cxx +++ b/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]); \ No newline at end of file +const std::vector< std::string > cxxSolution::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]); diff --git a/SurfaceCharge.cxx b/SurfaceCharge.cxx index 4dcb473b..5d2857d8 100644 --- a/SurfaceCharge.cxx +++ b/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]); \ No newline at end of file +const std::vector< std::string > cxxSurfaceCharge::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]); diff --git a/Temperature.cxx b/Temperature.cxx index 6c486d3b..d67afe82 100644 --- a/Temperature.cxx +++ b/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]); \ No newline at end of file +const std::vector< std::string > cxxTemperature::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]); diff --git a/UserPunch.h b/UserPunch.h index 599137b1..81d87168 100644 --- a/UserPunch.h +++ b/UserPunch.h @@ -36,4 +36,4 @@ protected: class rate * rate; Phreeqc * PhreeqcPtr; }; -#endif // !defined(USERPUNCH_H_INCLUDED) \ No newline at end of file +#endif // !defined(USERPUNCH_H_INCLUDED) diff --git a/common/PHRQ_base.cxx b/common/PHRQ_base.cxx index f2c164c2..6e48faaa 100644 --- a/common/PHRQ_base.cxx +++ b/common/PHRQ_base.cxx @@ -114,4 +114,4 @@ echo_msg(const std::string & stdstr) std::cout << stdstr << "\n"; #endif } -} \ No newline at end of file +} diff --git a/common/Parser.cxx b/common/Parser.cxx index 0469142b..db7d3556 100644 --- a/common/Parser.cxx +++ b/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)); -} \ No newline at end of file +} diff --git a/cxxMix.cxx b/cxxMix.cxx index af7c174d..8cd8e0be 100644 --- a/cxxMix.cxx +++ b/cxxMix.cxx @@ -151,4 +151,4 @@ void cxxMix::Vectorize(std::vector &n, std::vector &f) f.push_back(it->second); } } -const std::vector< std::string > cxxMix::vopts; \ No newline at end of file +const std::vector< std::string > cxxMix::vopts; diff --git a/global_structures.h b/global_structures.h index 619c75e6..9d07f324 100644 --- a/global_structures.h +++ b/global_structures.h @@ -1650,4 +1650,4 @@ public: LDBLE uncertainty; }; -#endif /* _INC_GLOBAL_STRUCTURES_H */ \ No newline at end of file +#endif /* _INC_GLOBAL_STRUCTURES_H */ diff --git a/pitzer.cpp b/pitzer.cpp index 68a57a39..0b5db899 100644 --- a/pitzer.cpp +++ b/pitzer.cpp @@ -2704,4 +2704,4 @@ pitzer_make_lists(void) } param_list.push_back(i); } -} \ No newline at end of file +} diff --git a/sit.cpp b/sit.cpp index fb372c3b..8f213e98 100644 --- a/sit.cpp +++ b/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); } -} \ No newline at end of file +} diff --git a/transport.cpp b/transport.cpp index 0f649fb0..88f33a29 100644 --- a/transport.cpp +++ b/transport.cpp @@ -6180,4 +6180,4 @@ flux_mcd(const char* species_name, int option) } } return (f); -} \ No newline at end of file +}