Browse code

parameter *str in getListElement changed to char const to avoid implicit casting of string to char*, which is forbidden by ISO C++ standard, regarding issue #14

David Rasp authored on 02/04/2019 15:55:03
Showing1 changed files

... ...
@@ -776,7 +776,7 @@ void initializeCHNOPS(alphabet_t& chnops, const int maxisotopes) {
776 776
 /* get the list element named str, or return NULL */
777 777
 /* http://cran.r-project.org/doc/manuals/R-exts.html#Handling-lists */
778 778
 
779
-SEXP getListElement(SEXP list, char *str)
779
+SEXP getListElement(SEXP list, char const *str)
780 780
   // {{{ 
781 781
 
782 782
 {
... ...
@@ -809,7 +809,7 @@ void initializeAlphabet(const SEXP l_alphabet,
809 809
   for (int i=0; i < Rf_length(l_alphabet); i++) {
810 810
     SEXP l = VECTOR_ELT(l_alphabet,i);
811 811
 	  
812
-    const char *symbol = CHAR(Rf_asChar(getListElement(l, "name")));
812
+    char const *symbol = CHAR(Rf_asChar(getListElement(l, "name")));
813 813
 
814 814
     nominal_mass_type nominalmass = (nominal_mass_type) REAL(getListElement(l, "mass"))[0];
815 815