@@ -56,12 +56,12 @@ template<class T, int d> omega::Dynamic_Array<T,d>::Dynamic_Array() do_constr(); } -template<class T> omega::Dynamic_Array1<T>::Dynamic_Array1(char *) +template<class T> omega::Dynamic_Array1<T>::Dynamic_Array1(const char *) { this->do_constr(); } -template<class T> omega::Dynamic_Array2<T>::Dynamic_Array2(char *,char *) +template<class T> omega::Dynamic_Array2<T>::Dynamic_Array2(const char *, const char *) { this->do_constr(); } basic/include/basic/Dynamic_Array.c @@ -28,7 +28,7 @@ template <class T, int d> class Dynamic_Array template <class T> class Dynamic_Array1 : public Dynamic_Array<T,1> { public: - Dynamic_Array1(char *s0 = 0); + Dynamic_Array1(const char *s0 = 0); Dynamic_Array1(int d0); void resize(int d0); T& operator[](int d); @@ -43,7 +43,7 @@ template <class T> class Dynamic_Array1 : public Dynamic_Array<T,1> template <class T> class Dynamic_Array2 : public Dynamic_Array<T,2> { public: - Dynamic_Array2(char *s0 = 0, char *s1 = 0); + Dynamic_Array2(const char *s0 = 0, const char *s1 = 0); Dynamic_Array2(int d0, int d1); void resize(int d0, int d1); Dynamic_Array1<T> operator[](int d); basic/include/basic/Dynamic_Array.h @@ -57,7 +57,7 @@ Tuple<stm_info> &Peel_One_IS(Tuple<stm_info> &info, int stm, int level, Relation void DoDebug2(char *message, const Tuple<stm_info> &info); -void DoDebug(char * message, int effort, const Tuple<stm_info> &info, const Relation &known); +void DoDebug(const char *message, int effort, const Tuple<stm_info> &info, const Relation &known); extern int code_gen_debug; code_gen/include/code_gen/mmap-util.h @@ -16,7 +16,7 @@ extern int Block_Size; extern int Num_Procs; extern int code_gen_debug; -static String replace_vars(char *my_stmt, Relation global_time) +static String replace_vars(const char *my_stmt, Relation global_time) { String S = ""; for (unsigned int i=0; i<strlen(my_stmt); i++) @@ -99,7 +99,7 @@ class numbered_stmt_info : public spmd_stmt_info { public: numbered_stmt_info() : stmt_num(-1) {} numbered_stmt_info(int arg, const Relation &in_time, - const Relation &in_space, char *stmt): + const Relation &in_space, const char *stmt): spmd_stmt_info(String("s") + itoS(arg),in_time,in_space), stmt_num(arg), my_stmt(stmt) @@ -151,7 +151,7 @@ public: private: int stmt_num; - char *my_stmt; + const char *my_stmt; }; } // end namespace omega code_gen/include/code_gen/spmd.h @@ -392,7 +392,7 @@ Tuple<stm_info> &Peel_One_IS(Tuple<stm_info> &info, int stm, int level, Relation /* useful from debugger */ -void DoDebug3(char *message, Relation &r) +void DoDebug3(const char *message, Relation &r) { fprintf(DebugFile, "%s: ", message); copy(r).print_with_subs(DebugFile); @@ -405,7 +405,7 @@ void DoDebug2(char *message, const Tuple<stm_info> &info) DoDebug(message, -1, info, Relation::True(0)); } -void DoDebug(char * message, int effort, const Tuple<stm_info> &info, const Relation &known) +void DoDebug(const char *message, int effort, const Tuple<stm_info> &info, const Relation &known) { String result=""; Tuple<stm_info> &noconst = (Tuple<stm_info> &)info; code_gen/src/mmap-util.c @@ -1,4 +1,4 @@ extern int yylex(void); -extern void yyerror(char * ); +extern void yyerror(const char *); extern void initializeScanBuffer(); extern void flushScanBuffer(); omega_calc/include/omega_calc/yylex.h @@ -35,7 +35,7 @@ void flushScanBuffer() { initializeScanBuffer(); } #define BUFFER strcat(scanBuf,yytext) -void yyerror(char *s) { +void yyerror(const char *s) { fprintf(stderr,"%s\n",s); fprintf(stderr,"line %d, at end of \"%s\"\n",yylineno,scanBuf); } omega_calc/src/parser.l @@ -9,7 +9,7 @@ namespace omega { -void PresErrAssert(char *t); +void PresErrAssert(const char *t); extern Rel_Body null_rel; omega_lib/include/omega/omega_i.h @@ -446,7 +446,7 @@ prettyPrintProblemToString() const int v1, v2, v3; int t, change; int stuffPrinted = 0; - char *connector = CONNECTOR; + const char *connector = CONNECTOR; typedef enum { none, le, lt @@ -733,7 +733,7 @@ Problem:: prettyPrintRedEquations() const { int e, stuffPrinted = 0; - char * connector = CONNECTOR; + const char *connector = CONNECTOR; if (!variablesInitialized) omega_lib/src/omega_core/oc_print.c @@ -17,7 +17,7 @@ negation_control pres_legal_negations = any_negation; // // I/O utility functions. // -void PresErrAssert(char *t) { +void PresErrAssert(const char *t) { fprintf(stdout, "\nERROR: %s\n", t); if(pres_debug) { fprintf(DebugFile, "\nERROR: %s\n", t); omega_lib/src/pres_gen.c @@ -179,7 +179,7 @@ const char *Var_Decl::char_name() { if (a) { if (use_ugly_names) { - static char *arg_names[4] = { "???", "In", "Out", "In == Out" }; + static const char *arg_names[4] = { "???", "In", "Out", "In == Out" }; sprintf(s, "(%s[1#%d])", arg_names[function_of()], a); } else { omega_lib/src/pres_var.c @@ -54,7 +54,7 @@ int Quit(int dummy ); extern void out_of_memory(); -void Write(char *); +void Write(const char *); } petit/include/petit/Exit.h @@ -228,7 +228,7 @@ void out_of_memory(void) namespace omega { -void Write(char *s) { +void Write(const char *s) { static int fd = -1; int l; if(fd<0) { petit/src/Exit.c e7ff46a06755cbf6b1194c39846e2a524bf2da59 Sven Verdoolaege skimo@kotnet.org http://github.com/davewathaverford/the-omega-project/commit/b3ec42bdfbc22f68036ea9dd14038cbf76cf5ecd b3ec42bdfbc22f68036ea9dd14038cbf76cf5ecd 2008-07-16T08:21:43-07:00 2007-07-19T03:26:30-07:00 string constants are of type const char * (not char *) Recent gcc's complain about this typing problem. 089fccf8409b8401c34fabb2d26925527b44cccd Sven Verdoolaege sven@cs.kuleuven.be