diff options
| author | redpony <redpony@ca354974-eb3a-0410-8f5c-d3948404989b> | 2010-07-31 22:28:07 +0400 |
|---|---|---|
| committer | redpony <redpony@ca354974-eb3a-0410-8f5c-d3948404989b> | 2010-07-31 22:28:07 +0400 |
| commit | a50e24fc485d6aeae19ff000977263b3adbe7e76 (patch) | |
| tree | 2f52300f3222acf6ca98cedb5a1482fc845346d9 | |
| parent | 4f7e56ee5e74db11c6c83118401cff6eecb41829 (diff) | |
few warnings
| -rw-r--r-- | mkcls-v2/Array.h | 4 | ||||
| -rw-r--r-- | mkcls-v2/FixedArray.h | 4 | ||||
| -rw-r--r-- | mkcls-v2/KategProblem.cpp | 6 | ||||
| -rw-r--r-- | mkcls-v2/KategProblemTest.cpp | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/mkcls-v2/Array.h b/mkcls-v2/Array.h index 5647fd0..ab1f101 100644 --- a/mkcls-v2/Array.h +++ b/mkcls-v2/Array.h @@ -180,7 +180,7 @@ template<class T> class Array {a=autoExp;} int findMax() const; int findMin() const; - const void errorAccess(int n) const; + void errorAccess(int n) const; inline T*getPointerToData(){return p;} inline T& operator[](int n) @@ -283,7 +283,7 @@ template<class T> bool operator<(const Array<T> &x, const Array<T> &y) } -template<class T> const void Array<T>:: errorAccess(int n) const +template<class T> void Array<T>:: errorAccess(int n) const { cerr << "ERROR: Access to array element " << n << " (" << maxWritten << "," << realSize << "," << (void*)p << " " << a << ")\n"; diff --git a/mkcls-v2/FixedArray.h b/mkcls-v2/FixedArray.h index 39da0b1..da2ce3e 100644 --- a/mkcls-v2/FixedArray.h +++ b/mkcls-v2/FixedArray.h @@ -143,7 +143,7 @@ template<class T> class FixedArray {return 0;} inline int high() const {return realSize-1;} - const void errorAccess(int n) const; + void errorAccess(int n) const; inline T& operator[](int n) { @@ -245,7 +245,7 @@ template<class T> int Hash(const FixedArray<T>&a) return n; } -template<class T> const void FixedArray<T>:: errorAccess(int n) const +template<class T> void FixedArray<T>:: errorAccess(int n) const { massert(0); cerr << "ERROR: Access to array element " << n diff --git a/mkcls-v2/KategProblem.cpp b/mkcls-v2/KategProblem.cpp index 7318fb6..88b50b3 100644 --- a/mkcls-v2/KategProblem.cpp +++ b/mkcls-v2/KategProblem.cpp @@ -395,9 +395,9 @@ int KategProblem::expectedNumberOfIterations() void KategProblem::makeTitle(char x[512]) { - char *ww; - char *kw; - char *in; + const char *ww; + const char *kw; + const char *in; switch(wortwahl()) { case W_RAN: diff --git a/mkcls-v2/KategProblemTest.cpp b/mkcls-v2/KategProblemTest.cpp index 8c76ce5..117a755 100644 --- a/mkcls-v2/KategProblemTest.cpp +++ b/mkcls-v2/KategProblemTest.cpp @@ -56,11 +56,12 @@ void writeClasses(Array<Kategory> &katOfWord,KategProblem &problem,ostream &to) { for(int i=0;i<katOfWord.size();i++) { - if( strcmp(problem.getString(i),"$") ) + if( strcmp(problem.getString(i),"$") ) { if( strcmp(problem.getString(i),"mkcls-mapped-dollar-symbol-$")==0 ) to << "$" << "\t" << katOfWord[i] << endl; else to << problem.getString(i) << "\t" << katOfWord[i] << endl; + } } } |