Revert accidental empty commits

[deliverable/binutils-gdb.git] / gdb / regcache.h

diff --git a/gdb/regcache.h b/gdb/regcache.h
index b8561d714c9edb268539c33b57a01deef42c8ef1..bb7d3c5ea86b4d1548a17dcbc479d8fa614b8b6c 100644 (file)
--- a/gdb/regcache.h
+++ b/gdb/regcache.h
@@ -22,7 +22,6 @@
 
 #include "gdbsupport/common-regcache.h"
 #include "gdbsupport/function-view.h"
-#include <forward_list>
 
 struct regcache;
 struct regset;
@@ -168,11 +167,11 @@ typedef gdb::function_view<register_status (int regnum, gdb_byte *buf)>
 
 /* A (register_number, register_value) pair.  */
 
-typedef struct cached_reg
+struct cached_reg_t
 {
   int num;
   gdb_byte *data;
-} cached_reg_t;
+};
 
 /* Buffer of registers.  */
 
@@ -397,13 +396,10 @@ public:
    debug.  */
   void debug_print_register (const char *func, int regno);
 
-  static void regcache_thread_ptid_changed (ptid_t old_ptid, ptid_t new_ptid);
 protected:
   regcache (process_stratum_target *target, gdbarch *gdbarch,
            const address_space *aspace);
 
-  static std::forward_list<regcache *> current_regcache;
-
 private:
 
   /* Helper function for transfer_regset.  Copies across a single register.  */
@@ -437,11 +433,10 @@ private:
   get_thread_arch_aspace_regcache (process_stratum_target *target, ptid_t ptid,
                                   struct gdbarch *gdbarch,
                                   struct address_space *aspace);
-
-  friend void
-  registers_changed_ptid (process_stratum_target *target, ptid_t ptid);
 };
 
+using regcache_up = std::unique_ptr<regcache>;
+
 class readonly_detached_regcache : public readable_regcache
 {
 public: