Ignore:
Timestamp:
Dec 23, 2016, 1:14:39 PM (2 years ago)
Author:
nmedfort
Message:

Reverted last change to support gcc 4.9 prior to changing UCD property table structure.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/UCD/PropertyObjects.h

    r5235 r5236  
    1414#include <vector>
    1515#include <unordered_map>
    16 #include <util/aligned_allocator.h>
    1716
    1817namespace UCD {
    19 
    20 using PropertyStringAllocator = AlignedAllocator<char, 32>;
    21 
    22 using PropertyString =
    23     std::basic_string<char, std::char_traits<char>, PropertyStringAllocator>;
    2418
    2519std::string canonicalize_value_name(const std::string & prop_or_val);
     
    4842    PropertyObject(property_t p, ClassTypeId k) : the_property(p), the_kind(k) {}
    4943    virtual int GetPropertyValueEnumCode(const std::string & value_spec);
    50     virtual const PropertyString & GetPropertyValueGrepString();
     44    virtual const std::string & GetPropertyValueGrepString();
    5145    property_t the_property;
    5246    ClassTypeId the_kind;
     
    9690
    9791    virtual int GetPropertyValueEnumCode(const std::string & value_spec);
    98     virtual const PropertyString & GetPropertyValueGrepString();
     92    virtual const std::string & GetPropertyValueGrepString();
    9993    const UnicodeSet & GetCodepointSet(const std::string & value_spec);
    10094    const UnicodeSet & GetCodepointSet(const int property_enum_val) const;
     
    107101    }
    108102
    109      iterator end() const {
     103    iterator end() const {
    110104        return property_value_enum_names.cend();
    111105    }
     
    116110    const std::vector<std::string> & property_value_full_names;  // never changes
    117111    std::unordered_map<std::string, int> & property_value_aliases;
    118     PropertyString property_value_grep_string;
     112    std::string mPropertyValueGrepString;
    119113    bool uninitialized; // full names must be added dynamically.
    120114    const std::vector<const UnicodeSet *> property_value_sets;
     
    146140
    147141    virtual int GetPropertyValueEnumCode(const std::string & value_spec);
    148     virtual const PropertyString & GetPropertyValueGrepString();
     142    virtual const std::string & GetPropertyValueGrepString();
    149143    const UnicodeSet & GetCodepointSet(const std::string & value_spec);
    150144    const UnicodeSet & GetCodepointSet(const int property_enum_val) const;
     
    172166    const UnicodeSet & GetCodepointSet(const std::string & value_spec);
    173167    const UnicodeSet & GetCodepointSet(const int property_enum_val);
    174     virtual const PropertyString & GetPropertyValueGrepString();
     168    virtual const std::string & GetPropertyValueGrepString();
    175169private:
    176170    bool mNoUninitialized;
    177171    UnicodeSet mY;
    178172    UnicodeSet mN;
    179     PropertyString property_value_grep_string;
     173    std::string mPropertyValueGrepString;
    180174};
    181175
Note: See TracChangeset for help on using the changeset viewer.