2009-06-29 Sami Wagiaalla <swagiaal@redhat.com>

	* dwarf2read.c (read_import_statement): Properly set import location
	and destination.
	* cp-support.h (cp_add_using, cp_add_using_directive): Now take char*
	inner, char* outer arguments. Updated callers.

2009-06-29  Sami Wagiaalla  <swagiaal@redhat.com>

	* gdb.cp/namespace-nested-import.cc: New test.
	* gdb.cp/namespace-nested-import.exp: New test.

3 files changed, 65 insertions, 0 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 78678fe..12b5b44 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-29  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	* gdb.cp/namespace-nested-import.cc: New test.
+	* gdb.cp/namespace-nested-import.exp: New test.
+
 2009-06-27  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gdb.base/break.exp: Add an XFAIL for gcc/36748.
diff --git a/gdb/testsuite/gdb.cp/namespace-nested-import.cc b/gdb/testsuite/gdb.cp/namespace-nested-import.cc
new file mode 100644
index 0000000..551f8ee
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/namespace-nested-import.cc
@@ -0,0 +1,12 @@
+namespace A{
+  namespace B{
+    namespace C{
+      int       x = 5;
+    }
+  }
+}
+
+int main(){
+  using namespace A::B;
+  return C::x;
+}
diff --git a/gdb/testsuite/gdb.cp/namespace-nested-import.exp b/gdb/testsuite/gdb.cp/namespace-nested-import.exp
new file mode 100644
index 0000000..37d9145
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/namespace-nested-import.exp
@@ -0,0 +1,48 @@
+# Copyright 2008 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+set prms_id 0
+set bug_id 0
+
+set testfile namespace-nested-import
+set srcfile ${testfile}.cc
+set binfile ${objdir}/${subdir}/${testfile}
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
+    untested "Couldn't compile test program"
+    return -1
+}
+
+# Get things started.
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+############################################
+# Test printing of a variable from a nested
+# in a namespace inner to the one which has
+# been imported.
+
+if ![runto_main] then {
+    perror "couldn't run to breakpoint main"
+    continue
+}
+
+gdb_test "print C::x" "= 5"