summaryrefslogtreecommitdiff
path: root/ext/pybind11/tests/object.h
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas.sandberg@arm.com>2017-05-09 19:22:53 +0100
committerAndreas Sandberg <andreas.sandberg@arm.com>2017-05-22 17:15:09 +0000
commit6914a229a038206341ae1fea46393965a555ca9a (patch)
tree4a11cfaed46dabc827c5ee17cd976f42b5f53d49 /ext/pybind11/tests/object.h
parentca1d18d599dcc620bf526fb22042af95b1b60b68 (diff)
downloadgem5-6914a229a038206341ae1fea46393965a555ca9a.tar.xz
ext: Upgrade PyBind11 to version 2.1.1
Change-Id: I16870dec402d661295f9d013dc23e362b2b2c169 Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-by: Curtis Dunham <curtis.dunham@arm.com> Reviewed-on: https://gem5-review.googlesource.com/3225 Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'ext/pybind11/tests/object.h')
-rw-r--r--ext/pybind11/tests/object.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pybind11/tests/object.h b/ext/pybind11/tests/object.h
index 753f654b2..9235f19c2 100644
--- a/ext/pybind11/tests/object.h
+++ b/ext/pybind11/tests/object.h
@@ -164,10 +164,10 @@ public:
operator T* () { return m_ptr; }
/// Return a const pointer to the referenced object
- T* get() { return m_ptr; }
+ T* get_ptr() { return m_ptr; }
/// Return a pointer to the referenced object
- const T* get() const { return m_ptr; }
+ const T* get_ptr() const { return m_ptr; }
private:
T *m_ptr;
};