merged the case/diac sensitivity code back into trunk

src/utils/smallut.cpp

@@ -33,17 +33,12 @@
 #include <string>
 #include <iostream>
 #include <list>
+using namespace std;
 
 #include "smallut.h"
 #include "utf8iter.h"
 #include "hldata.h"
 
-#ifndef NO_NAMESPACES
-using namespace std;
-#endif /* NO_NAMESPACES */
-
-#define MIN(A,B) ((A)<(B)?(A):(B))
-
 int stringicmp(const string & s1, const string& s2) 
 {
     string::const_iterator it1 = s1.begin();

src/utils/smallut.h

@@ -224,4 +224,11 @@ public:
     }
 };
 
+#ifndef MIN
+#define MIN(A,B) (((A)<(B)) ? (A) : (B))
+#endif
+#ifndef MAX
+#define MAX(A,B) (((A)>(B)) ? (A) : (B))
+#endif
+
 #endif /* _SMALLUT_H_INCLUDED_ */

src/utils/utf8iter.h

@@ -103,7 +103,7 @@ public:
 
     /** Append current utf-8 possibly multi-byte character to string param.
 	This needs to be fast. No error checking. */
-    unsigned int appendchartostring(std::string &out) {
+    unsigned int appendchartostring(std::string &out) const {
 #ifdef UTF8ITER_CHECK
 	assert(m_cl != 0);
 #endif