webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 26 insertions, 12 deletions

diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.h b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.h
index 8b553aecb..716503b32 100644
--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.h
+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.h
@@ -10,7 +10,7 @@
 #include <ostream>
 #include <string>
 
-#include "SourceLocation.h"
+#include "compiler/preprocessor/SourceLocation.h"
 
 namespace pp
 {
@@ -62,27 +62,40 @@ struct Token
         EXPANSION_DISABLED = 1 << 2
     };
 
-    Token() : type(0), flags(0) { }
+    Token()
+        : type(0),
+          flags(0)
+    {
+    }
 
     void reset();
-    bool equals(const Token& other) const;
+    bool equals(const Token &other) const;
 
     // Returns true if this is the first token on line.
     // It disregards any leading whitespace.
-    bool atStartOfLine() const { return (flags & AT_START_OF_LINE) != 0; }
+    bool atStartOfLine() const
+    {
+        return (flags & AT_START_OF_LINE) != 0;
+    }
     void setAtStartOfLine(bool start);
 
-    bool hasLeadingSpace() const { return (flags & HAS_LEADING_SPACE) != 0; }
+    bool hasLeadingSpace() const
+    {
+        return (flags & HAS_LEADING_SPACE) != 0;
+    }
     void setHasLeadingSpace(bool space);
 
-    bool expansionDisabled() const { return (flags & EXPANSION_DISABLED) != 0; }
+    bool expansionDisabled() const
+    {
+        return (flags & EXPANSION_DISABLED) != 0;
+    }
     void setExpansionDisabled(bool disable);
 
     // Converts text into numeric value for CONST_INT and CONST_FLOAT token.
     // Returns false if the parsed value cannot fit into an int or float.
-    bool iValue(int* value) const;
-    bool uValue(unsigned int* value) const;
-    bool fValue(float* value) const;
+    bool iValue(int *value) const;
+    bool uValue(unsigned int *value) const;
+    bool fValue(float *value) const;
 
     int type;
     unsigned int flags;
@@ -90,17 +103,18 @@ struct Token
     std::string text;
 };
 
-inline bool operator==(const Token& lhs, const Token& rhs)
+inline bool operator==(const Token &lhs, const Token &rhs)
 {
     return lhs.equals(rhs);
 }
 
-inline bool operator!=(const Token& lhs, const Token& rhs)
+inline bool operator!=(const Token &lhs, const Token &rhs)
 {
     return !lhs.equals(rhs);
 }
 
-extern std::ostream& operator<<(std::ostream& out, const Token& token);
+std::ostream &operator<<(std::ostream &out, const Token &token);
 
 }  // namepsace pp
+
 #endif  // COMPILER_PREPROCESSOR_TOKEN_H_