diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8f42b1f76b6233d93c390ca1eae7b2e291e0438e..739f9936bce3c356fec0814533f6ec3033ad55b2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2005-04-17  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* cp-tree.h (LOOKUP_GLOBAL): Remove.
+	(LOOKUP_ONLYCONVERTING, DIRECT_BIND, LOOKUP_NO_CONVERSION,
+	LOOKUP_DESTRUCTOR, LOOKUP_NO_TEMP_BIND, LOOKUP_PREFER_TYPES,
+	LOOKUP_PREFER_NAMESPACES, LOOKUP_CONSTRUCTOR_CALLABLE): Adjust
+	their values.
+
 2005-04-15  Richard Henderson  <rth@redhat.com>
 
 	PR middle-end/14311
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 584698bc5dbae4bb93a04389b0d33f02526b6a2f..dd6523ffb171935cbec6841bc0092de2a80bd224 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3272,8 +3272,6 @@ enum overload_flags { NO_SPECIAL = 0, DTOR_FLAG, OP_FLAG, TYPENAME_FLAG };
      matching the arguments is found.
    LOOKUP_NORMAL is just a combination of these two.
    LOOKUP_NONVIRTUAL means make a direct call to the member function found
-   LOOKUP_GLOBAL means search through the space of overloaded functions,
-     as well as the space of member functions.
    LOOKUP_ONLYCONVERTING means that non-conversion constructors are not tried.
    DIRECT_BIND means that if a temporary is created, it should be created so
      that it lives as long as the current variable bindings; otherwise it
@@ -3297,16 +3295,15 @@ enum overload_flags { NO_SPECIAL = 0, DTOR_FLAG, OP_FLAG, TYPENAME_FLAG };
 #define LOOKUP_COMPLAIN (1 << 1)
 #define LOOKUP_NORMAL (LOOKUP_PROTECT | LOOKUP_COMPLAIN)
 #define LOOKUP_NONVIRTUAL (1 << 2)
-#define LOOKUP_GLOBAL (1 << 3)
-#define LOOKUP_ONLYCONVERTING (1 << 4)
-#define DIRECT_BIND (1 << 5)
-#define LOOKUP_NO_CONVERSION (1 << 6)
-#define LOOKUP_DESTRUCTOR (1 << 7)
-#define LOOKUP_NO_TEMP_BIND (1 << 8)
-#define LOOKUP_PREFER_TYPES (1 << 9)
-#define LOOKUP_PREFER_NAMESPACES (1 << 10)
+#define LOOKUP_ONLYCONVERTING (1 << 3)
+#define DIRECT_BIND (1 << 4)
+#define LOOKUP_NO_CONVERSION (1 << 5)
+#define LOOKUP_DESTRUCTOR (1 << 6)
+#define LOOKUP_NO_TEMP_BIND (1 << 7)
+#define LOOKUP_PREFER_TYPES (1 << 8)
+#define LOOKUP_PREFER_NAMESPACES (1 << 9)
 #define LOOKUP_PREFER_BOTH (LOOKUP_PREFER_TYPES | LOOKUP_PREFER_NAMESPACES)
-#define LOOKUP_CONSTRUCTOR_CALLABLE (1 << 11)
+#define LOOKUP_CONSTRUCTOR_CALLABLE (1 << 10)
 
 #define LOOKUP_NAMESPACES_ONLY(F)  \
   (((F) & LOOKUP_PREFER_NAMESPACES) && !((F) & LOOKUP_PREFER_TYPES))