Changeset 8666

Timestamp:

2004-11-25T10:20:30+13:00 (19 years ago)

Author:

jrm21

Message:

renamed multibyte variable since that is the name of a macro on solaris.

Location:

trunk/gsdl/lib

Files:

• gsdlunicode.cpp (modified) (3 diffs)
• gsdlunicode.h (modified) (5 diffs)

trunk/gsdl/lib/gsdlunicode.cpp

@@ -415 +415 @@
 
 mapinconvertclass::mapinconvertclass () {
-  multibyte = 0;
+  m_multibyte = 0;
   mapbuflen = 0;
 }
@@ -484 +484 @@
 
 mapoutconvertclass::mapoutconvertclass () {
-  multibyte = 0;
+  m_multibyte = 0;
   mapbuflen=0; 
   mapbufhere=0;
@@ -537 +537 @@
     } else {
       outc = converter.convert (*texthere);
-      if (multibyte) {
+      if (m_multibyte) {
         mapbuf[0] = (unsigned char)(outc >> 8);
         mapbuf[1] = (unsigned char)(outc & 0xff);

trunk/gsdl/lib/gsdlunicode.h

@@ -158 +158 @@
   };
 
-  void set_multibyte (int new_multibyte) {multibyte = new_multibyte;};
+  void set_multibyte (int new_multibyte) {m_multibyte = new_multibyte;};
 
   void reset ();
@@ -167 +167 @@
   unsigned char mapbuf[MAXMAPCHARLEN];
   size_t mapbuflen;
-  int multibyte;
+  int m_multibyte;
 
   // note: multiple instances of mapinconvert class are expensive
@@ -180 +180 @@
     if (mapbuflen == 0) return 0;
     if (mapbuf[0] < 0x80) return 1;
-    if (!multibyte) return 1;
+    if (!m_multibyte) return 1;
     return 2;
   }
@@ -203 +203 @@
   };
 
-  void set_multibyte (int new_multibyte) {multibyte = new_multibyte;};
+  void set_multibyte (int new_multibyte) {m_multibyte = new_multibyte;};
 
   void reset ();
@@ -213 +213 @@
   size_t mapbuflen;
   size_t mapbufhere;
-  int multibyte;
+  int m_multibyte;
 
   mapconvert converter;