diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0b7e80975b9..db68053d80f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-01  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+	PR c++/12796
+	* class.c (handle_using_decl): Set input_location before calling
+	error_not_base_type.
+
 2003-10-26  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
 
 	PR c++/10371
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index a053956ad9a..300d8466a01 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -1109,7 +1109,11 @@ handle_using_decl (tree using_decl, tree t)
   binfo = lookup_base (t, ctype, ba_any, NULL);
   if (! binfo)
     {
+      location_t saved_loc = input_location;
+
+      input_location = DECL_SOURCE_LOCATION (using_decl);
       error_not_base_type (ctype, t);
+      input_location = saved_loc;
       return;
     }