C++: remove reserved names.

See [global.names] (17.6.4.3.2 in the C++11 spec.)

Change-Id: I8434496dbe392b52d339d5f17cfaeee8dbd88995
Reviewed-by: Nikolai Kosjar <[email protected]>

1 files changed, 75 insertions, 75 deletions

diff --git a/src/libs/cplusplus/pp-scanner.cpp b/src/libs/cplusplus/pp-scanner.cpp
index 51d5c5671d8..fea29d9cd2d 100644
--- a/src/libs/cplusplus/pp-scanner.cpp
+++ b/src/libs/cplusplus/pp-scanner.cpp
@@ -51,39 +51,39 @@
 
 using namespace CPlusPlus;
 
-const char *pp_skip_blanks::operator () (const char *__first, const char *__last)
+const char *pp_skip_blanks::operator () (const char *first, const char *last)
 {
     lines = 0;
 
-    for (; __first != __last; lines += (*__first != '\n' ? 0 : 1), ++__first) {
-        if (*__first == '\\') {
-            const char *__begin = __first;
-            ++__begin;
+    for (; first != last; lines += (*first != '\n' ? 0 : 1), ++first) {
+        if (*first == '\\') {
+            const char *begin = first;
+            ++begin;
 
-            if (__begin != __last && *__begin == '\n')
-                ++__first;
+            if (begin != last && *begin == '\n')
+                ++first;
             else
                 break;
-        } else if (*__first == '\n' || !pp_isspace (*__first))
+        } else if (*first == '\n' || !pp_isspace (*first))
             break;
     }
 
-    return __first;
+    return first;
 }
 
-const char *pp_skip_whitespaces::operator () (const char *__first, const char *__last)
+const char *pp_skip_whitespaces::operator () (const char *first, const char *last)
 {
     lines = 0;
 
-    for (; __first != __last; lines += (*__first != '\n' ? 0 : 1), ++__first) {
-        if (! pp_isspace (*__first))
+    for (; first != last; lines += (*first != '\n' ? 0 : 1), ++first) {
+        if (! pp_isspace (*first))
             break;
     }
 
-    return __first;
+    return first;
 }
 
-const char *pp_skip_comment_or_divop::operator () (const char *__first, const char *__last)
+const char *pp_skip_comment_or_divop::operator () (const char *first, const char *last)
 {
     enum {
         MAYBE_BEGIN,
@@ -96,77 +96,77 @@ const char *pp_skip_comment_or_divop::operator () (const char *__first, const ch
 
     lines = 0;
 
-    for (; __first != __last; lines += (*__first != '\n' ? 0 : 1), ++__first) {
+    for (; first != last; lines += (*first != '\n' ? 0 : 1), ++first) {
         switch (state) {
         default:
             break;
 
         case MAYBE_BEGIN:
-            if (*__first != '/')
-                return __first;
+            if (*first != '/')
+                return first;
 
             state = BEGIN;
             break;
 
         case BEGIN:
-            if (*__first == '*')
+            if (*first == '*')
                 state = IN_COMMENT;
-            else if (*__first == '/')
+            else if (*first == '/')
                 state = IN_CXX_COMMENT;
             else
-                return __first;
+                return first;
             break;
 
         case IN_COMMENT:
-            if (*__first == '*')
+            if (*first == '*')
                 state = MAYBE_END;
             break;
 
         case IN_CXX_COMMENT:
-            if (*__first == '\n')
-                return __first;
+            if (*first == '\n')
+                return first;
             break;
 
         case MAYBE_END:
-            if (*__first == '/')
+            if (*first == '/')
                 state = END;
-            else if (*__first != '*')
+            else if (*first != '*')
                 state = IN_COMMENT;
             break;
 
         case END:
-            return __first;
+            return first;
         }
     }
 
-    return __first;
+    return first;
 }
 
-const char *pp_skip_identifier::operator () (const char *__first, const char *__last)
+const char *pp_skip_identifier::operator () (const char *first, const char *last)
 {
     lines = 0;
 
-    for (; __first != __last; lines += (*__first != '\n' ? 0 : 1), ++__first) {
-        if (! pp_isalnum (*__first) && *__first != '_')
+    for (; first != last; lines += (*first != '\n' ? 0 : 1), ++first) {
+        if (! pp_isalnum (*first) && *first != '_')
             break;
     }
 
-    return __first;
+    return first;
 }
 
-const char *pp_skip_number::operator () (const char *__first, const char *__last)
+const char *pp_skip_number::operator () (const char *first, const char *last)
 {
     lines = 0;
 
-    for (; __first != __last; lines += (*__first != '\n' ? 0 : 1), ++__first) {
-        if (! pp_isalnum (*__first) && *__first != '.')
+    for (; first != last; lines += (*first != '\n' ? 0 : 1), ++first) {
+        if (! pp_isalnum (*first) && *first != '.')
             break;
     }
 
-    return __first;
+    return first;
 }
 
-const char *pp_skip_string_literal::operator () (const char *__first, const char *__last)
+const char *pp_skip_string_literal::operator () (const char *first, const char *last)
 {
     enum {
         BEGIN,
@@ -177,25 +177,25 @@ const char *pp_skip_string_literal::operator () (const char *__first, const char
 
     lines = 0;
 
-    for (; __first != __last; lines += (*__first != '\n' ? 0 : 1), ++__first) {
+    for (; first != last; lines += (*first != '\n' ? 0 : 1), ++first) {
         switch (state)
         {
         default:
             break;
 
         case BEGIN:
-            if (*__first != '\"')
-                return __first;
+            if (*first != '\"')
+                return first;
             state = IN_STRING;
             break;
 
         case IN_STRING:
-            if (! (*__first != '\n'))
-                return __last;
+            if (! (*first != '\n'))
+                return last;
 
-            if (*__first == '\"')
+            if (*first == '\"')
                 state = END;
-            else if (*__first == '\\')
+            else if (*first == '\\')
                 state = QUOTE;
             break;
 
@@ -204,14 +204,14 @@ const char *pp_skip_string_literal::operator () (const char *__first, const char
             break;
 
         case END:
-            return __first;
+            return first;
         }
     }
 
-    return __first;
+    return first;
 }
 
-const char *pp_skip_char_literal::operator () (const char *__first, const char *__last)
+const char *pp_skip_char_literal::operator () (const char *first, const char *last)
 {
     enum {
         BEGIN,
@@ -222,25 +222,25 @@ const char *pp_skip_char_literal::operator () (const char *__first, const char *
 
     lines = 0;
 
-    for (; state != END && __first != __last; lines += (*__first != '\n' ? 0 : 1), ++__first) {
+    for (; state != END && first != last; lines += (*first != '\n' ? 0 : 1), ++first) {
         switch (state)
         {
         default:
             break;
 
         case BEGIN:
-            if (*__first != '\'')
-                return __first;
+            if (*first != '\'')
+                return first;
             state = IN_STRING;
             break;
 
         case IN_STRING:
-            if (! (*__first != '\n'))
-                return __last;
+            if (! (*first != '\n'))
+                return last;
 
-            if (*__first == '\'')
+            if (*first == '\'')
                 state = END;
-            else if (*__first == '\\')
+            else if (*first == '\\')
                 state = QUOTE;
             break;
 
@@ -250,44 +250,44 @@ const char *pp_skip_char_literal::operator () (const char *__first, const char *
         }
     }
 
-    return __first;
+    return first;
 }
 
-const char *pp_skip_argument::operator () (const char *__first, const char *__last)
+const char *pp_skip_argument::operator () (const char *first, const char *last)
 {
     int depth = 0;
     lines = 0;
 
-    while (__first != __last) {
-        if (!depth && (*__first == ')' || *__first == ',')) {
+    while (first != last) {
+        if (!depth && (*first == ')' || *first == ',')) {
             break;
-        } else if (*__first == '(') {
-            ++depth, ++__first;
-        } else if (*__first == ')') {
-            --depth, ++__first;
-        } else if (*__first == '\"') {
-            __first = skip_string_literal (__first, __last);
+        } else if (*first == '(') {
+            ++depth, ++first;
+        } else if (*first == ')') {
+            --depth, ++first;
+        } else if (*first == '\"') {
+            first = skip_string_literal (first, last);
             lines += skip_string_literal.lines;
-        } else if (*__first == '\'') {
-            __first = skip_char_literal (__first, __last);
+        } else if (*first == '\'') {
+            first = skip_char_literal (first, last);
             lines += skip_char_literal.lines;
-        } else if (*__first == '/') {
-            __first = skip_comment_or_divop (__first, __last);
+        } else if (*first == '/') {
+            first = skip_comment_or_divop (first, last);
             lines += skip_comment_or_divop.lines;
-        } else if (pp_isalpha (*__first) || *__first == '_') {
-            __first = skip_identifier (__first, __last);
+        } else if (pp_isalpha (*first) || *first == '_') {
+            first = skip_identifier (first, last);
             lines += skip_identifier.lines;
-        } else if (pp_isdigit (*__first)) {
-            __first = skip_number (__first, __last);
+        } else if (pp_isdigit (*first)) {
+            first = skip_number (first, last);
             lines += skip_number.lines;
-        } else if (*__first == '\n') {
-            ++__first;
+        } else if (*first == '\n') {
+            ++first;
             ++lines;
         } else {
-            ++__first;
+            ++first;
         }
     }
 
-    return __first;
+    return first;
 }