Ignore:
Timestamp:
May 10, 2016, 12:12:41 AM (3 years ago)
Author:
nmedfort
Message:

UnicodeSet? bug fix and compile warning clean-up.

File:
1 edited

Legend:

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

    r4983 r5037  
    3939public:
    4040    using Allocator = SlabAllocator<u_int8_t>;
    41     using VectorAllocator = Allocator::rebind<RE *>::other;
     41    using VectorAllocator = SlabAllocator<RE *>;
    4242    enum class ClassTypeId : unsigned {
    4343        Alt
     
    7272
    7373    static Allocator mAllocator;
     74    static VectorAllocator mVectorAllocator;
    7475};
    7576
     
    8283    inline Vector(const ClassTypeId id)
    8384    : RE(id)
    84     , std::vector<RE*, RE::VectorAllocator>(reinterpret_cast<VectorAllocator &>(mAllocator))
     85    , std::vector<RE*, RE::VectorAllocator>(mVectorAllocator)
    8586    {
    8687
     
    8889    inline Vector(const ClassTypeId id, const iterator begin, const iterator end)
    8990    : RE(id)
    90     , std::vector<RE*, RE::VectorAllocator>(begin, end, reinterpret_cast<VectorAllocator &>(mAllocator)) {
     91    , std::vector<RE*, RE::VectorAllocator>(begin, end, mVectorAllocator) {
    9192
    9293    }
Note: See TracChangeset for help on using the changeset viewer.