diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
commit | 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 (patch) | |
tree | e2fc5ec44d0e83e7f8d066b14d1628b8f5cebe87 /xfa/src/fgas/include/fx_utl.h | |
parent | 63de95b699a4374982c2ddffced89e0da028fe4c (diff) | |
download | pdfium-6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33.tar.xz |
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
Diffstat (limited to 'xfa/src/fgas/include/fx_utl.h')
-rw-r--r-- | xfa/src/fgas/include/fx_utl.h | 2 |
1 files changed, 1 insertions, 1 deletions
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<baseType>;
};
template<class baseType>
-class CFX_CPLTree : public CFX_Object
+class CFX_CPLTree
{
public:
typedef CFX_CPLTreeNode<baseType> CPLTreeNode;
|