Ignore:
Timestamp:
Nov 5, 2015, 4:41:37 PM (4 years ago)
Author:
nmedfort
Message:

Back up check in. Memory leaks should be fixed.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/re/re_re.h

    r4829 r4860  
    3939public:
    4040    using Allocator = SlabAllocator<u_int8_t>;
    41     using VectorAllocator = SlabAllocator<RE *>;
     41    using VectorAllocator = Allocator::rebind<RE *>::other;
    4242    enum class ClassTypeId : unsigned {
    4343        Alt
     
    7272
    7373    static Allocator mAllocator;
    74     static VectorAllocator mVectorAllocator;
    7574};
    7675
     
    8382    inline Vector(const ClassTypeId id)
    8483    : RE(id)
    85     , std::vector<RE*, RE::VectorAllocator>(RE::mVectorAllocator)
     84    , std::vector<RE*, RE::VectorAllocator>(reinterpret_cast<VectorAllocator &>(mAllocator))
    8685    {
    8786
     
    8988    inline Vector(const ClassTypeId id, const iterator begin, const iterator end)
    9089    : RE(id)
    91     , std::vector<RE*, RE::VectorAllocator>(begin, end, RE::mVectorAllocator) {
     90    , std::vector<RE*, RE::VectorAllocator>(begin, end, reinterpret_cast<VectorAllocator &>(mAllocator)) {
    9291
    9392    }
Note: See TracChangeset for help on using the changeset viewer.