[PATCH kvm-unit-tests] api: rip more TR1 prefixes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
---
 api/identity.cc |  2 +-
 api/identity.hh | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/identity.cc b/api/identity.cc
index 2e7987f..6dd4231 100644
--- a/api/identity.cc
+++ b/api/identity.cc
@@ -109,7 +109,7 @@ void vcpu::setup_regs()
     _vcpu.set_regs(regs);
 }
 
-vcpu::vcpu(kvm::vcpu& vcpu, std::tr1::function<void ()> guest_func,
+vcpu::vcpu(kvm::vcpu& vcpu, std::function<void ()> guest_func,
            unsigned long stack_size)
     : _vcpu(vcpu), _guest_func(guest_func), _stack(stack_size)
 {
diff --git a/api/identity.hh b/api/identity.hh
index 2e75a08..b95cb15 100644
--- a/api/identity.hh
+++ b/api/identity.hh
@@ -3,8 +3,8 @@
 
 #include "kvmxx.hh"
 #include "memmap.hh"
-#include <tr1/functional>
-#include <tr1/memory>
+#include <functional>
+#include <memory>
 #include <vector>
 
 namespace identity {
@@ -22,13 +22,13 @@ public:
     ~vm();
 private:
     void *tss;
-    typedef std::tr1::shared_ptr<mem_slot> mem_slot_ptr;
+    typedef std::shared_ptr<mem_slot> mem_slot_ptr;
     std::vector<mem_slot_ptr> _slots;
 };
 
 class vcpu {
 public:
-    vcpu(kvm::vcpu& vcpu, std::tr1::function<void ()> guest_func,
+    vcpu(kvm::vcpu& vcpu, std::function<void ()> guest_func,
 	 unsigned long stack_size = 256 * 1024);
 private:
     static void thunk(vcpu* vcpu);
@@ -36,7 +36,7 @@ private:
     void setup_sregs();
 private:
     kvm::vcpu& _vcpu;
-    std::tr1::function<void ()> _guest_func;
+    std::function<void ()> _guest_func;
     std::vector<char> _stack;
 };
 
-- 
1.8.3.1




[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux