libtransport.git Changeset - 47e44a081a36

Changeset - 47e44a081a36

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 13 years ago 2012-08-01 21:37:50
hanzz.k@gmail.com

Fixed ordering in utf8 header

1 file changed with 29 insertions and 29 deletions:

src/utf8/checked.h

0 comments (0 inline, 0 general)

src/utf8/checked.h

➞

Show inline comments

@@ @@ -65,6 +65,35 @@ namespace utf8 @@
     /// The library API - functions intended to be called by the users
     template <typename octet_iterator>
     octet_iterator append(uint32_t cp, octet_iterator result)
+    {
         if (!internal::is_code_point_valid(cp))
             throw invalid_code_point(cp);
         if (cp < 0x80)                        // one octet
             *(result++) = static_cast<uint8_t>(cp);
         else if (cp < 0x800) {                // two octets
             *(result++) = static_cast<uint8_t>((cp >> 6)            | 0xc0);
             *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
         else if (cp < 0x10000) {              // three octets
             *(result++) = static_cast<uint8_t>((cp >> 12)           | 0xe0);
             *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)     | 0x80);
             *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
         else if (cp <= internal::CODE_POINT_MAX) {      // four octets
             *(result++) = static_cast<uint8_t>((cp >> 18)           | 0xf0);
             *(result++) = static_cast<uint8_t>(((cp >> 12)& 0x3f)     | 0x80);
             *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)     | 0x80);
             *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
         else
             throw invalid_code_point(cp);
         return result;
+    }
     template <typename octet_iterator, typename output_iterator>
     output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement)
+    {
@@ @@ -103,35 +132,6 @@ namespace utf8 @@
         return replace_invalid(start, end, out, replacement_marker);
+    }
     template <typename octet_iterator>
     octet_iterator append(uint32_t cp, octet_iterator result)
+    {
         if (!internal::is_code_point_valid(cp))
             throw invalid_code_point(cp);
         if (cp < 0x80)                        // one octet
             *(result++) = static_cast<uint8_t>(cp);
         else if (cp < 0x800) {                // two octets
             *(result++) = static_cast<uint8_t>((cp >> 6)            | 0xc0);
             *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
         else if (cp < 0x10000) {              // three octets
             *(result++) = static_cast<uint8_t>((cp >> 12)           | 0xe0);
             *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)     | 0x80);
             *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
         else if (cp <= internal::CODE_POINT_MAX) {      // four octets
             *(result++) = static_cast<uint8_t>((cp >> 18)           | 0xf0);
             *(result++) = static_cast<uint8_t>(((cp >> 12)& 0x3f)     | 0x80);
             *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)     | 0x80);
             *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
         else
             throw invalid_code_point(cp);
         return result;
+    }
     template <typename octet_iterator>
     uint32_t next(octet_iterator& it, octet_iterator end)
+    {

0 comments (0 inline, 0 general)