82a83,97
>      * Encodes octets into Base64 data
>      * 
>      * @param inputData Byte array containing binary data.
>      * @param inputLength Length of the input array.
>      * @param outputLength Pointer to variable, where will be
>      *     stored length of returned data.
>      * @return Byte array containing encoded Base64 data,
>      *     or NULL if input data can not be encoded.
>      */
>     static XMLCh* encode (
>         const XMLCh* const inputData,
>         const int inputLength,
>         int *outputLength = 0 );
> 
>     /**
84,85c99,100
<      * returns length of decoded data given an
<      * array containing encoded data.
---
>      * returns length of decoded data given an array 
>      * containing encoded data.
87,88c102,104
<      * @param base64Data Byte array containing Base64 data
<      * @return         a -1 would be return if not
---
>      * @param inputData Byte array containing Base64 data.
>      * @return Length of decoded data, or -1 if input data
>      *     can not be decoded.
90c106,107
<     static int getDataLength(const XMLCh* const base64Data);
---
>     static int getDataLength(
>         const XMLCh* const inputData );
93c110
<      * Decodes Base64 data into octects
---
>      * Decodes Base64 data into octets
95,96c112,116
<      * @param binaryData Byte array containing Base64 data
<      * @return Array containind decoded data.
---
>      * @param inputData Byte array containing Base64 data.
>      * @param outputLength Reference to variable, where will be
>      *     stored length of returned data.
>      * @return Byte array containing decoded binary data, or 
>      *     NULL if input data can not be decoded.
98c118,120
<     static XMLCh* decode(const XMLCh* const base64Data, int& base64DataLen);
---
>     static XMLCh* decode(
>         const XMLCh* const inputData,
>         int& outputLength );
110,112c132,133
<     static bool isData(const XMLCh& octect);
< 
<     static bool isPad(const XMLCh& octect);
---
>     static bool isData(const XMLCh& octet);
>     static bool isPad(const XMLCh& octet);
114,118c135,141
<     static XMLCh set1stOctect(const XMLCh&, const XMLCh&);
< 
<     static XMLCh set2ndOctect(const XMLCh&, const XMLCh&);
< 
<     static XMLCh set3rdOctect(const XMLCh&, const XMLCh&);
---
>     static XMLCh set1stOctet(const XMLCh&, const XMLCh&);
>     static XMLCh set2ndOctet(const XMLCh&, const XMLCh&);
>     static XMLCh set3rdOctet(const XMLCh&, const XMLCh&);
> 
>     static void split1stOctet(const XMLCh&, XMLCh&, XMLCh&);
>     static void split2ndOctet(const XMLCh&, XMLCh&, XMLCh&);
>     static void split3rdOctet(const XMLCh&, XMLCh&, XMLCh&);
129c152,153
<     //  isInitialized
---
>     //  base64Alphabet
>     //     The Base64 alphabet (see RFC 2045).
131c155,156
<     //     set once hexNumberTable is initalized.
---
>     //  base64Padding
>     //     Padding character (see RFC 2045).
133c158,159
<     //  base64Alphabet
---
>     //  base64Inverse
>     //     Table used in decoding base64.
135c161,167
<     //     table used in decoding base64
---
>     //  isInitialized
>     //     Set once base64Inverse is initalized.
>     //
>     //  quadsPerLine
>     //     Number of quadruplets per one line. The encoded output
>     //     stream must be represented in lines of no more 
>     //     than 19 quadruplets each.
139,140c171,175
<     static bool    isInitialized;
<     static XMLCh   base64Alphabet[];
---
>     static const XMLCh  base64Alphabet[];
>     static const XMLCh  base64Padding;
> 
>     static XMLCh  base64Inverse[];
>     static bool  isInitialized;
141a177
>     static const unsigned int  quadsPerLine;
147c183
< inline bool Base64::isPad(const XMLCh& octect) 
---
> inline bool Base64::isPad(const XMLCh& octet) 
149c185
<     return(octect == chEqual);
---
>     return ( octet == base64Padding );
152c188
< inline XMLCh Base64::set1stOctect(const XMLCh& b1, const XMLCh& b2)
---
> inline XMLCh Base64::set1stOctet(const XMLCh& b1, const XMLCh& b2)
154c190
<     return (( b1 <<2 ) | ( b2>>4 ));
---
>     return (( b1 << 2 ) | ( b2 >> 4 ));
157c193
< inline XMLCh Base64::set2ndOctect(const XMLCh& b2, const XMLCh& b3)
---
> inline XMLCh Base64::set2ndOctet(const XMLCh& b2, const XMLCh& b3)
159c195
<     return ((( b2 & 0xf )<<4 ) | (( b3>>2 ) & 0xf));
---
>     return (( b2 << 4 ) | ( b3 >> 2 ));
162c198
< inline XMLCh Base64::set3rdOctect(const XMLCh& b3, const XMLCh& b4)
---
> inline XMLCh Base64::set3rdOctet(const XMLCh& b3, const XMLCh& b4)
164c200
<     return (( b3<<6 ) | b4 );
---
>     return (( b3 << 6 ) | b4 );
167c203,206
< #endif
---
> inline void Base64::split1stOctet(const XMLCh& ch, XMLCh& b1, XMLCh& b2) {
>     b1 = ch >> 2;
>     b2 = ( ch & 0x3 ) << 4;
> }
168a208,218
> inline void Base64::split2ndOctet(const XMLCh& ch, XMLCh& b2, XMLCh& b3) {
>     b2 |= ch >> 4;  // combine with previous value
>     b3 = ( ch & 0xf ) << 2;
> }
> 
> inline void Base64::split3rdOctet(const XMLCh& ch, XMLCh& b3, XMLCh& b4) {
>     b3 |= ch >> 6;  // combine with previous value 
>     b4 = ( ch & 0x3f );
> }
> 
> #endif