From bf5b0bc2d53d82bc6ff62ceec2fdaa8b796aa130 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Fri, 17 Jan 2014 16:47:15 +0100 Subject: emulator/opengl: Refactor SmartPtr implementation. This gets rid of two copies of SmartPtr.h and replaces them with a single implementation under shared/emugl/common/smart_ptr.* Note that this uses a new include path rooted at the shared/ directory for classes that are likely to be built both for the host and the device (in case we back-port this to device/generic/goldfish/opengl/ in the future). + Add a gtest-based set of unittests, after building, just call 'emugl_common_host_unittests' to run it. Note that this probably needs a 64-bit version as well, will come later once I find a way to build GTest for 64-bits without breaking the platform build :-) Also note that this moves the class to the 'emugl' namespace, in order to make the code easier to build out of the platform tree, and embed it in other projects. More classes will be transitioned / refactored in future patches. AOSP_BUG=64806 Change-Id: Ieb326c5f3f002a21537b8a391a82ce2ef9925073 --- emulator/opengl/host/libs/libOpenglRender/RenderContext.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'emulator/opengl/host/libs/libOpenglRender/RenderContext.h') diff --git a/emulator/opengl/host/libs/libOpenglRender/RenderContext.h b/emulator/opengl/host/libs/libOpenglRender/RenderContext.h index 9cbb5fc..80ac43f 100644 --- a/emulator/opengl/host/libs/libOpenglRender/RenderContext.h +++ b/emulator/opengl/host/libs/libOpenglRender/RenderContext.h @@ -16,12 +16,12 @@ #ifndef _LIBRENDER_RENDERCONTEXT_H #define _LIBRENDER_RENDERCONTEXT_H -#include "SmartPtr.h" +#include "emugl/common/smart_ptr.h" #include #include "GLDecoderContextData.h" class RenderContext; -typedef SmartPtr RenderContextPtr; +typedef emugl::SmartPtr RenderContextPtr; class RenderContext { -- cgit v1.1