diff options
| author | Siva Chandra Reddy <sivachandra@google.com> | 2014-09-30 15:33:27 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-09-30 16:33:27 +0100 |
| commit | b073d15fe57dc6cb8b8ec9537afd69616877db85 (patch) | |
| tree | ebc1952e5cb2194433e32f48e8f45c593a6b5f2b | |
| parent | f6a55c069ebe69713759123418db001da7bb8c05 (diff) | |
| download | gcc-b073d15fe57dc6cb8b8ec9537afd69616877db85.zip gcc-b073d15fe57dc6cb8b8ec9537afd69616877db85.tar.gz gcc-b073d15fe57dc6cb8b8ec9537afd69616877db85.tar.bz2 | |
hook.in: Only import libstdcxx.v6.
2014-09-30 Siva Chandra Reddy <sivachandra@google.com>
* python/hook.in: Only import libstdcxx.v6.
* python/libstdcxx/v6/__init__.py: Load printers and xmethods.
From-SVN: r215726
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/python/hook.in | 16 | ||||
| -rw-r--r-- | libstdc++-v3/python/libstdcxx/v6/__init__.py | 31 |
3 files changed, 37 insertions, 15 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d70ba08..73935c5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2014-09-30 Siva Chandra Reddy <sivachandra@google.com> + + * python/hook.in: Only import libstdcxx.v6. + * python/libstdcxx/v6/__init__.py: Load printers and xmethods. + 2014-09-30 Jonathan Wakely <jwakely@redhat.com> * doc/xml/manual/status_cxx2011.xml: Update. diff --git a/libstdc++-v3/python/hook.in b/libstdc++-v3/python/hook.in index aeb1cdb..30cf538 100644 --- a/libstdc++-v3/python/hook.in +++ b/libstdc++-v3/python/hook.in @@ -55,18 +55,4 @@ if gdb.current_objfile () is not None: if not dir_ in sys.path: sys.path.insert(0, dir_) -# Load the pretty-printers. -from libstdcxx.v6.printers import register_libstdcxx_printers -register_libstdcxx_printers (gdb.current_objfile ()) - -# Load the xmethods if GDB supports them. -def gdb_has_xmethods(): - try: - import gdb.xmethod - return True - except ImportError: - return False - -if gdb_has_xmethods(): - from libstdcxx.v6.xmethods import register_libstdcxx_xmethods - register_libstdcxx_xmethods (gdb.current_objfile ()) +import libstdcxx.v6 diff --git a/libstdc++-v3/python/libstdcxx/v6/__init__.py b/libstdc++-v3/python/libstdcxx/v6/__init__.py index 8b13789..59c1f27 100644 --- a/libstdc++-v3/python/libstdcxx/v6/__init__.py +++ b/libstdc++-v3/python/libstdcxx/v6/__init__.py @@ -1 +1,32 @@ +# Copyright (C) 2014 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/>. + +import gdb + +# Load the pretty-printers. +from printers import register_libstdcxx_printers +register_libstdcxx_printers(gdb.current_objfile()) + +# Load the xmethods if GDB supports them. +def gdb_has_xmethods(): + try: + import gdb.xmethod + return True + except ImportError: + return False + +if gdb_has_xmethods(): + from xmethods import register_libstdcxx_xmethods + register_libstdcxx_xmethods(gdb.current_objfile()) |