Reorg'd! I merged in the release-fixup branch and fixed all random warnings.

I also cleaned up the build script, the symlink generation is faster and looks
nicer, there's one think left to fix there, but it's not too bad.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/utfstring.cpp b/src/utfstring.cpp
index 3f57618..19d3ddc 100644
--- a/src/utfstring.cpp
+++ b/src/utfstring.cpp
@@ -121,7 +121,7 @@ void Bu::UtfString::setUtf8( const Bu::String &sInput )
 
 void Bu::UtfString::setUtf16( const Bu::String &sInput )
 {
-        Bu::String::const_iterator i = sInput.begin();
+//      Bu::String::const_iterator i = sInput.begin();
         if( (uint8_t)*sInput.begin() == 0xFF &&
                 (uint8_t)*(sInput.begin()+1) == 0xFE )
         {
@@ -311,9 +311,9 @@ void Bu::UtfString::writeUtf8( Bu::Stream &sOut )
                         // 111 111111 111111 111111
                         uByte = (chr>>18)|0xF0;
                         sOut.write( &uByte, 1 );
-                        uByte = (chr>>12)&0x3F|0x80;
+                        uByte = ((chr>>12)&0x3F)|0x80;
                         sOut.write( &uByte, 1 );
-                        uByte = (chr>>6)&0x3F|0x80;
+                        uByte = ((chr>>6)&0x3F)|0x80;
                         sOut.write( &uByte, 1 );
                         uByte = (chr&0x3F)|0x80;
                         sOut.write( &uByte, 1 );
@@ -324,7 +324,7 @@ void Bu::UtfString::writeUtf8( Bu::Stream &sOut )
                         // 1111 111111 111111
                         uByte = (chr>>12)|0xE0;
                         sOut.write( &uByte, 1 );
-                        uByte = (chr>>6)&0x3F|0x80;
+                        uByte = ((chr>>6)&0x3F)|0x80;
                         sOut.write( &uByte, 1 );
                         uByte = (chr&0x3F)|0x80;
                         sOut.write( &uByte, 1 );