Changeset 143 for Mulberry/trunk/Sources_Common/Formatting/CParserHTML.cp

Timestamp:

11/20/07 23:45:14 (1 year ago)

Author:

daboo

Message:

Merge of win32-merge branch.

Files:

• Mulberry/trunk/Sources_Common/Formatting/CParserHTML.cp (modified) (4 diffs)

Mulberry/trunk/Sources_Common/Formatting/CParserHTML.cp

@@ -30 +30 @@
 
 #include <strstream>
+#include <math.h>
+
 using namespace std;
 #if __dest_os == __linux_os
@@ -922 +924 @@
         {
                 long amount = ::uniatol(sizeStr);
-                if (sizeStr[0UL] == '+' || sizeStr[0UL] == '-')
+                if (sizeStr[(cdstring::size_type)0] == '+' || sizeStr[(cdstring::size_type)0] == '-')
                         amount += mBaseFontSize;
 
@@ -1025 +1027 @@
 
                 // Allow URLs without schemes provided they are local
-                if (mClickList && !location.empty() && (!scheme.empty() || location[0UL] == '#'))
+                if (mClickList && !location.empty() && (!scheme.empty() || location[(cdstring::size_type)0] == '#'))
                 {
                         // Create click element
@@ -1239 +1241 @@
 
                         // Look for relative URL
-                        if (!outLocation.empty() && (outLocation[0UL] != '/'))
+                        if (!outLocation.empty() && (outLocation[(cdstring::size_type)0] != '/'))
                         {
                                 // Short circuit the common ones