Merge to XFA: Kill CFX_Object.

core/src/fxge/agg/agg23/agg_array.h

 
 //----------------------------------------------------------------------------
 // Anti-Grain Geometry - Version 2.3
 // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
 //
 // Permission to copy, use, modify, sell and distribute this software
 // is granted provided this copyright notice appears in all copies.
 // This software is provided "as is" without express or implied
 // warranty, and with no claim as to its suitability for any purpose.
 //
 //----------------------------------------------------------------------------
 // Contact: mcseem@antigrain.com
 //          mcseemagg@yahoo.com
 //          http://www.antigrain.com
 //----------------------------------------------------------------------------
 #ifndef AGG_ARRAY_INCLUDED
 #define AGG_ARRAY_INCLUDED
 #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;
     ~pod_array()
     {
         FX_Free(m_array);
     }
     pod_array() : m_size(0), m_capacity(0), m_array(0) {}
     pod_array(unsigned cap, unsigned extra_tail = 0);
     pod_array(const pod_array<T>&);
@@ skipping 118 matching lines @@
 }
 template<class T> const pod_array<T>&
 pod_array<T>::operator = (const pod_array<T>&v)
 {
     allocate(v.m_size);
     if(v.m_size) {
         FXSYS_memcpy(m_array, v.m_array, sizeof(T) * v.m_size);
     }
     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 {
         block_shift = S,
         block_size  = 1 << block_shift,
         block_mask  = block_size - 1
     };
     typedef T value_type;
     ~pod_deque();
     pod_deque();
@@ skipping 231 matching lines @@
         m_size += num_elements;
         return index;
     }
     return -1;
 }
 template<class T, unsigned S>
 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()
     {
         if(m_num_blocks) {
             int8u** blk = m_blocks + m_num_blocks - 1;
             while(m_num_blocks--) {
                 FX_Free(*blk);
                 --blk;
             }
@@ skipping 78 matching lines @@
     quick_sort_threshold = 9
 };
 template<class T> inline void swap_elements(T& a, T& b)
 {
     T temp = a;
     a = b;
     b = temp;
 }
 }
 #endif