| Index: third_party/WebKit/Source/platform/PODRedBlackTree.h
|
| diff --git a/third_party/WebKit/Source/platform/PODRedBlackTree.h b/third_party/WebKit/Source/platform/PODRedBlackTree.h
|
| index e791558beffa6df5c6fadf22fcff2c26e72267d2..c17b08bbac72d143e6d4f8f01f9de51102590d91 100644
|
| --- a/third_party/WebKit/Source/platform/PODRedBlackTree.h
|
| +++ b/third_party/WebKit/Source/platform/PODRedBlackTree.h
|
| @@ -245,7 +245,7 @@ public:
|
| }
|
| #endif
|
|
|
| - enum Color {
|
| + enum NodeColor {
|
| Red = 1,
|
| Black
|
| };
|
| @@ -269,8 +269,8 @@ public:
|
|
|
| virtual ~Node() { }
|
|
|
| - Color color() const { return m_color; }
|
| - void setColor(Color color) { m_color = color; }
|
| + NodeColor color() const { return m_color; }
|
| + void setColor(NodeColor color) { m_color = color; }
|
|
|
| // Fetches the user data.
|
| T& data() { return m_data; }
|
| @@ -296,7 +296,7 @@ public:
|
| Node* m_left;
|
| Node* m_right;
|
| Node* m_parent;
|
| - Color m_color;
|
| + NodeColor m_color;
|
| T m_data;
|
| };
|
|
|
|
|