From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: Merge to XFA: Kill CFX_Object. Not just a simple merge, but changes to remove CFX_Object from XFA. Original Review URL: https://codereview.chromium.org/1088733002 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1087053002 --- xfa/src/fgas/include/fx_utl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xfa/src/fgas/include/fx_utl.h') diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h index 354d4bf2bb..850543786c 100644 --- a/xfa/src/fgas/include/fx_utl.h +++ b/xfa/src/fgas/include/fx_utl.h @@ -752,7 +752,7 @@ protected: friend class CFX_CPLTree; }; template -class CFX_CPLTree : public CFX_Object +class CFX_CPLTree { public: typedef CFX_CPLTreeNode CPLTreeNode; -- cgit v1.2.3