summaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorjkratoch <jkratoch@138bc75d-0d04-0410-961f-82ee72b054a4>2010-08-06 20:43:04 +0000
committerjkratoch <jkratoch@138bc75d-0d04-0410-961f-82ee72b054a4>2010-08-06 20:43:04 +0000
commit41683b0f5643c31adb256949070c813c2ff7ee5a (patch)
tree8dc484aa68455cc7d8956b936df119a355cd2b76 /libstdc++-v3
parent18854ff6cc1edff0dce796def3de579e1afa55b8 (diff)
downloadgcc-41683b0f5643c31adb256949070c813c2ff7ee5a.tar.gz
libstdc++-v3/
* python/hook.in: Rename variable dir to dir_. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@162962 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/python/hook.in6
2 files changed, 8 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ccdf13a939c..4056c5a033e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-06 David Malcolm <dmalcolm@redhat.com>
+ Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * python/hook.in: Rename variable dir to dir_.
+
2010-08-06 Jason Merrill <jason@redhat.com>
* include/std/thread: Add deleted thread(thread&).
diff --git a/libstdc++-v3/python/hook.in b/libstdc++-v3/python/hook.in
index d4c290f82cd..c76d4a3b3eb 100644
--- a/libstdc++-v3/python/hook.in
+++ b/libstdc++-v3/python/hook.in
@@ -50,10 +50,10 @@ if gdb.current_objfile () is not None:
dotdots = ('..' + os.sep) * len (libdir.split (os.sep))
objfile = gdb.current_objfile ().filename
- dir = os.path.join (os.path.dirname (objfile), dotdots, pythondir)
+ dir_ = os.path.join (os.path.dirname (objfile), dotdots, pythondir)
- if not dir in sys.path:
- sys.path.insert(0, dir)
+ if not dir_ in sys.path:
+ sys.path.insert(0, dir_)
# Load the pretty-printers.
from libstdcxx.v6.printers import register_libstdcxx_printers