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 /core/src/fxge/agg/agg23/agg_array.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 'core/src/fxge/agg/agg23/agg_array.h')
| -rw-r--r-- | core/src/fxge/agg/agg23/agg_array.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/fxge/agg/agg23/agg_array.h b/core/src/fxge/agg/agg23/agg_array.h index f5680d90fe..b3b5f2b877 100644 --- a/core/src/fxge/agg/agg23/agg_array.h +++ b/core/src/fxge/agg/agg23/agg_array.h @@ -18,7 +18,7 @@ #include "agg_basics.h" namespace agg { -template<class T> class pod_array : public CFX_Object +template<class T> class pod_array { public: typedef T value_type; @@ -157,7 +157,7 @@ pod_array<T>::operator = (const pod_array<T>&v) } return *this; } -template<class T, unsigned S = 6> class pod_deque : public CFX_Object +template<class T, unsigned S = 6> class pod_deque { public: enum block_scale_e { @@ -409,7 +409,7 @@ unsigned pod_deque<T, S>::byte_size() const { return m_size * sizeof(T); } -class pod_allocator : public CFX_Object +class pod_allocator { public: void remove_all() |