diff options
| author | Tor Egge <Tor.Egge@oath.com> | 2017-09-27 15:44:29 +0000 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@oath.com> | 2017-09-27 15:44:29 +0000 |
| commit | 3c0a6eeb15b12c8f925fca131849cffa4a386cb1 (patch) | |
| tree | 9f0519cd2480abfa390273adafec1f1c1e057231 /searchlib | |
| parent | 749d284497ada752e6cab05529f85d17350b3414 (diff) | |
Be more explicit when creating data types masks.
Diffstat (limited to 'searchlib')
| -rw-r--r-- | searchlib/src/vespa/searchlib/fef/parameterdescriptions.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/searchlib/src/vespa/searchlib/fef/parameterdescriptions.h b/searchlib/src/vespa/searchlib/fef/parameterdescriptions.h index a7d40768a16..59dd38cf0cd 100644 --- a/searchlib/src/vespa/searchlib/fef/parameterdescriptions.h +++ b/searchlib/src/vespa/searchlib/fef/parameterdescriptions.h @@ -52,11 +52,24 @@ private: static uint32_t asMask(DataType dataType) { return (1u << static_cast<unsigned int>(dataType)); } - static uint32_t allTypesMask() { - return (asMask(DataType::REFERENCE) << 1) - 1; - } static uint32_t normalTypesMask() { - return asMask(DataType::BOOLEANTREE) - 1; + return (asMask(DataType::UINT1) | + asMask(DataType::UINT2) | + asMask(DataType::UINT4) | + asMask(DataType::INT8) | + asMask(DataType::INT16) | + asMask(DataType::INT32) | + asMask(DataType::INT64) | + asMask(DataType::FLOAT) | + asMask(DataType::DOUBLE) | + asMask(DataType::STRING) | + asMask(DataType::RAW)); + } + static uint32_t allTypesMask() { + return (normalTypesMask() | + asMask(DataType::BOOLEANTREE) | + asMask(DataType::TENSOR) | + asMask(DataType::REFERENCE)); } ParameterDataTypeSet(uint32_t typeMask) : _typeMask(typeMask) |