[llvm-commits] [llvm-gcc-4.2] r75467 - in /llvm-gcc-4.2/trunk/gcc/cp: decl.c name-lookup.c parser.c
Rafael Espindola
rafael.espindola at gmail.com
Mon Jul 13 07:11:20 PDT 2009
Author: rafael
Date: Mon Jul 13 09:11:20 2009
New Revision: 75467
URL: http://llvm.org/viewvc/llvm-project?rev=75467&view=rev
Log:
Use C-style comments.
Modified:
llvm-gcc-4.2/trunk/gcc/cp/decl.c
llvm-gcc-4.2/trunk/gcc/cp/name-lookup.c
llvm-gcc-4.2/trunk/gcc/cp/parser.c
Modified: llvm-gcc-4.2/trunk/gcc/cp/decl.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/decl.c?rev=75467&r1=75466&r2=75467&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/decl.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/decl.c Mon Jul 13 09:11:20 2009
@@ -10433,14 +10433,14 @@
| DECL_SELF_REFERENCE_P (decl));
return t;
}
- //LLVM LOCAL begin mainline
+ /* LLVM LOCAL begin mainline */
else if (decl && TREE_CODE (decl) == TREE_LIST)
{
error ("reference to %qD is ambiguous", name);
print_candidates (decl);
return error_mark_node;
}
- //LLVM LOCAL end mainline
+ /* LLVM LOCAL begin mainline */
else
return NULL_TREE;
}
Modified: llvm-gcc-4.2/trunk/gcc/cp/name-lookup.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/name-lookup.c?rev=75467&r1=75466&r2=75467&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/name-lookup.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/name-lookup.c Mon Jul 13 09:11:20 2009
@@ -2114,7 +2114,7 @@
return;
}
- //LLVM LOCAL begin mainline
+ /* LLVM LOCAL begin mainline */
/* Shift the old and new bindings around so we're comparing class and
enumeration names to each other. */
if (oldval && DECL_IMPLICIT_TYPEDEF_P (oldval))
@@ -2128,7 +2128,7 @@
decls.type = decls.value;
decls.value = NULL_TREE;
}
- //LLVM LOCAL end mainline
+ /* LLVM LOCAL end mainline */
/* It is impossible to overload a built-in function; any explicit
declaration eliminates the built-in declaration. So, if OLDVAL
@@ -2139,7 +2139,7 @@
&& !DECL_HIDDEN_FRIEND_P (oldval))
oldval = NULL_TREE;
- //LLVM LOCAL begin mainline
+ /* LLVM LOCAL begin mainline */
if (decls.value)
{
/* Check for using functions. */
@@ -2244,7 +2244,7 @@
*newval = *newtype;
*newtype = NULL_TREE;
}
- //LLVM LOCAL end mainline
+ /* LLVM LOCAL end mainline */
}
/* Process a using-declaration at function scope. */
@@ -3564,7 +3564,7 @@
XXX In what way should I treat extern declarations?
XXX I don't want to repeat the entire duplicate_decls here */
-//LLVM LOCAL begin mainline
+/* LLVM LOCAL begin mainline */
static void
ambiguous_decl (struct scope_binding *old, cxx_binding *new, int flags)
{
@@ -3620,7 +3620,7 @@
type = NULL_TREE;
}
-//LLVM LOCAL end mainline
+/* LLVM LOCAL end mainline */
if (!old->value)
old->value = val;
/* APPLE LOCAL C++ using lookup 4329536 */
@@ -3631,14 +3631,14 @@
else
{
old->value = tree_cons (NULL_TREE, old->value,
- //LLVM LOCAL begin mainline
+ /* LLVM LOCAL begin mainline */
build_tree_list (NULL_TREE, val));
- //LLVM LOCAL end mainline
+ /* LLVM LOCAL end mainline */
TREE_TYPE (old->value) = error_mark_node;
}
}
- //LLVM LOCAL begin mainline
+ /* LLVM LOCAL begin mainline */
if (!old->type)
old->type = type;
else if (type && old->type != type)
@@ -3647,7 +3647,7 @@
build_tree_list (NULL_TREE, type));
TREE_TYPE (old->type) = error_mark_node;
}
- //LLVM LOCAL end mainline
+ /* LLVM LOCAL end mainline */
}
/* Return the declarations that are members of the namespace NS. */
@@ -3752,16 +3752,16 @@
for (; !val; scope = CP_DECL_CONTEXT (scope))
{
- //LLVM LOCAL begin mainline
+ /* LLVM LOCAL begin mainline */
struct scope_binding binding = EMPTY_SCOPE_BINDING;
- //LLVM LOCAL end mainline
+ /* LLVM LOCAL end mainline */
cxx_binding *b =
cxx_scope_find_binding_for_name (NAMESPACE_LEVEL (scope), name);
if (b)
- //LLVM LOCAL begin mainline
+ /* LLVM LOCAL begin mainline */
ambiguous_decl (&binding, b, flags);
- //LLVM LOCAL end mainline
+ /* LLVM LOCAL end mainline */
/* Add all _DECLs seen through local using-directives. */
for (level = current_binding_level;
@@ -3786,9 +3786,9 @@
siter = CP_DECL_CONTEXT (siter);
}
- //LLVM LOCAL begin mainline
+ /* LLVM LOCAL begin mainline */
val = binding.value;
- //LLVM LOCAL end mainline
+ /* LLVM LOCAL end mainline */
if (scope == global_namespace)
break;
}
@@ -3818,9 +3818,9 @@
if (is_type_p)
flags |= LOOKUP_PREFER_TYPES;
if (qualified_lookup_using_namespace (name, scope, &binding, flags))
- //LLVM LOCAL begin mainline
+ /* LLVM LOCAL begin mainline */
t = binding.value;
- //LLVM LOCAL end mainline
+ /* LLVM LOCAL end mainline */
}
else if (is_aggr_type (scope, complain))
t = lookup_member (scope, name, 2, is_type_p);
@@ -3853,9 +3853,9 @@
cxx_scope_find_binding_for_name (NAMESPACE_LEVEL (used), name);
/* Resolve ambiguities. */
if (val1)
- //LLVM LOCAL begin mainline
+ /* LLVM LOCAL begin mainline */
ambiguous_decl (val, val1, flags);
- //LLVM LOCAL end mainline
+ /* LLVM LOCAL end mainline */
}
POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, val->value != error_mark_node);
}
@@ -3884,9 +3884,9 @@
cxx_scope_find_binding_for_name (NAMESPACE_LEVEL (scope), name);
seen = tree_cons (scope, NULL_TREE, seen);
if (binding)
- //LLVM LOCAL begin mainline
+ /* LLVM LOCAL begin mainline */
ambiguous_decl (result, binding, flags);
- //LLVM LOCAL end mainline
+ /* LLVM LOCAL end mainline */
/* Consider strong using directives always, and non-strong ones
if we haven't found a binding yet. ??? Shouldn't we consider
Modified: llvm-gcc-4.2/trunk/gcc/cp/parser.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/parser.c?rev=75467&r1=75466&r2=75467&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/parser.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/parser.c Mon Jul 13 09:11:20 2009
@@ -11177,25 +11177,25 @@
if (parser->scope)
{
tree decl;
- //LLVM LOCAL begin mainline
+ /* LLVM LOCAL begin mainline */
tree ambiguous_decls;
- //LLVM LOCAL end mainline
+ /* LLVM LOCAL end mainline */
decl = cp_parser_lookup_name (parser, identifier,
tag_type,
/*is_template=*/false,
/*is_namespace=*/false,
/*check_dependency=*/true,
- //LLVM LOCAL begin mainline
+ /* LLVM LOCAL begin mainline */
&ambiguous_decls);
- //LLVM LOCAL end mainline
+ /* LLVM LOCAL end mainline */
- //LLVM LOCAL begin mainline
+ /* LLVM LOCAL begin mainline */
/* If the lookup was ambiguous, an error will already have been
issued. */
if (ambiguous_decls)
return error_mark_node;
- //LLVM LOCAL end mainline
+ /* LLVM LOCAL end mainline */
/* If we are parsing friend declaration, DECL may be a
TEMPLATE_DECL tree node here. However, we need to check
More information about the llvm-commits
mailing list