cp-tree.h (build_scoped_method_call): Remove.

[thirdparty/gcc.git] / gcc / cp / search.c

diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index cee35ff2d525d5245d715bc8c52d63079289f95c..64e5707e1f0f484550764995d0d1d9e98f85e2e1 100644 (file)
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -1712,9 +1712,7 @@ check_final_overrider (tree overrider, tree basefn)
        {
          /* can_convert will permit user defined conversion from a
             (reference to) class type. We must reject them.  */
-         over_return = TREE_TYPE (over_type);
-         if (TREE_CODE (over_return) == REFERENCE_TYPE)
-           over_return = TREE_TYPE (over_return);
+         over_return = non_reference (TREE_TYPE (over_type));
          if (CLASS_TYPE_P (over_return))
            fail = 2;
        }