diff options
author | Ian Rogers <irogers@google.com> | 2014-05-19 16:49:03 -0700 |
---|---|---|
committer | Ian Rogers <irogers@google.com> | 2014-05-19 22:27:39 -0700 |
commit | 700a402244a1a423da4f3ba8032459f4b65fa18f (patch) | |
tree | 4c22fcda04d271bd55a37aff30650214af17a90c /runtime/mirror/proxy.h | |
parent | 047c11adcbcbc0bcf210defdfcbada763961ffee (diff) | |
download | art-700a402244a1a423da4f3ba8032459f4b65fa18f.zip art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.gz art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.bz2 |
Now we have a proper C++ library, use std::unique_ptr.
Also remove the Android.libcxx.mk and other bits of stlport compatibility
mechanics.
Change-Id: Icdf7188ba3c79cdf5617672c1cfd0a68ae596a61
Diffstat (limited to 'runtime/mirror/proxy.h')
-rw-r--r-- | runtime/mirror/proxy.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/mirror/proxy.h b/runtime/mirror/proxy.h index 5f9cceb..6e4947e 100644 --- a/runtime/mirror/proxy.h +++ b/runtime/mirror/proxy.h @@ -30,18 +30,18 @@ namespace mirror { class MANAGED SynthesizedProxyClass : public Class { public: ObjectArray<Class>* GetInterfaces() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - return GetFieldObject<ObjectArray<Class> >(OFFSET_OF_OBJECT_MEMBER(SynthesizedProxyClass, + return GetFieldObject<ObjectArray<Class>>(OFFSET_OF_OBJECT_MEMBER(SynthesizedProxyClass, interfaces_)); } - ObjectArray<ObjectArray<Class> >* GetThrows() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - return GetFieldObject<ObjectArray<ObjectArray<Class> > >(OFFSET_OF_OBJECT_MEMBER(SynthesizedProxyClass, + ObjectArray<ObjectArray<Class>>* GetThrows() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + return GetFieldObject<ObjectArray<ObjectArray<Class>>>(OFFSET_OF_OBJECT_MEMBER(SynthesizedProxyClass, throws_)); } private: - HeapReference<ObjectArray<Class> > interfaces_; - HeapReference<ObjectArray<ObjectArray<Class> > > throws_; + HeapReference<ObjectArray<Class>> interfaces_; + HeapReference<ObjectArray<ObjectArray<Class>>> throws_; DISALLOW_IMPLICIT_CONSTRUCTORS(SynthesizedProxyClass); }; |