the fstream/iostream changes and some small other things

[features.git] / src / mathed / math_iter.C

diff --git a/src/mathed/math_iter.C b/src/mathed/math_iter.C
index 4dc8789ca088b16cf991dfea3904d4012a618c6f..7ff4a84f06fdb7a7c26ed9a73047dd0f4684be64 100644 (file)
--- a/src/mathed/math_iter.C
+++ b/src/mathed/math_iter.C
@@ -36,18 +36,21 @@ extern int mathed_char_height(short, int, byte, int&, int&);
 
 // the builtin memcpy() is broken in egcs and gcc 2.95.x on alpha
 // stations. We provide a hand-made version instead. 
-inline void my_memcpy( void* ps_in, const void* pt_in, unsigned int n )
+inline void my_memcpy( void * ps_in, const void * pt_in, size_t n )
 {
-    char* ps = static_cast<char*>(ps_in);
-    char* pt = static_cast<char*>(const_cast<void*>(pt_in));
-    for( int i = 0; i < n; i++)
-       *ps++ = *pt++; 
+    char * ps = static_cast<char *>(ps_in);
+    char const * pt = static_cast<char const *>(pt_in);
+    /*
+    for(size_t i = n; i--;)
+       *ps++ = *pt++;
+       */
+    while (n--) *ps++ = *pt++;
 }
 
 
 void MathedIter::Reset()
 {
-    if (array->last>0 && MathIsFont(array->bf[0])) {
+    if (array->last > 0 && MathIsFont(array->bf[0])) {
        fcode = array->bf[0];
        pos = 1;
     } else {