aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Seitz <keiths@redhat.com>2016-02-26 12:22:24 -0800
committerKeith Seitz <keiths@redhat.com>2016-02-26 12:42:28 -0800
commit1ed0c2a4bbe8ad5f5404014a6351b2b74db75577 (patch)
tree803a2e94a7a56e681918c48503f73088059e618c
parent12a132db164ea95e9e457427c2c97005f94c5a70 (diff)
downloadgdb-1ed0c2a4bbe8ad5f5404014a6351b2b74db75577.zip
gdb-1ed0c2a4bbe8ad5f5404014a6351b2b74db75577.tar.gz
gdb-1ed0c2a4bbe8ad5f5404014a6351b2b74db75577.tar.bz2
Fix CXX invalid cast from void *.
This is an obvious patch to fix the following build error seen with --enable-build-with-cxx: ../../src/gdb/rs6000-tdep.c: In function ‘rs6000_frame_cache* rs6000_frame_cache(frame_info*, void**)’: ../../src/gdb/rs6000-tdep.c:3242:15: error: invalid conversion from ‘void*’ to ‘rs6000_frame_cache*’ [-fpermissive] return (*this_cache); ~^~~~~~~~~~~~ gdb/ChangeLog * rs6000-tdep.c (rs6000_frame_cache): Explicitly cast return result to avoid invalid conversion from void *.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/rs6000-tdep.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e45b87d..bcbaacf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-26 Keith Seitz <keiths@redhat.com>
+
+ * rs6000-tdep.c (rs6000_frame_cache): Explicitly cast return result
+ to avoid invalid conversion from void *.
+
2016-02-26 Yao Qi <yao.qi@linaro.org>
* arm-tdep.c (arm_record_exreg_ld_st_insn): Set 'single_reg'
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index d0c56d7..c2b6638 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -3239,7 +3239,7 @@ rs6000_frame_cache (struct frame_info *this_frame, void **this_cache)
{
if (ex.error != NOT_AVAILABLE_ERROR)
throw_exception (ex);
- return (*this_cache);
+ return (struct rs6000_frame_cache *) (*this_cache);
}
END_CATCH