Mercurial > hg > svcore
comparison data/fileio/CSVFormat.h @ 1027:ce1077bd663a cxx11
Merge from default branch
author | Chris Cannam |
---|---|
date | Mon, 09 Feb 2015 10:31:07 +0000 |
parents | 1888ca033a84 |
children | 26cf6d5251ec |
comparison
equal
deleted
inserted
replaced
1011:dbb7f0ab011e | 1027:ce1077bd663a |
---|---|
51 ColumnPitch, | 51 ColumnPitch, |
52 ColumnLabel | 52 ColumnLabel |
53 }; | 53 }; |
54 | 54 |
55 enum ColumnQuality { | 55 enum ColumnQuality { |
56 ColumnNumeric = 0x1, | 56 ColumnNumeric = 1, |
57 ColumnIntegral = 0x2, | 57 ColumnIntegral = 2, |
58 ColumnIncreasing = 0x4, | 58 ColumnIncreasing = 4, |
59 ColumnLarge = 0x8 | 59 ColumnLarge = 8, |
60 ColumnNearEmpty = 16, | |
60 }; | 61 }; |
61 typedef unsigned int ColumnQualities; | 62 typedef unsigned int ColumnQualities; |
62 | 63 |
63 CSVFormat() : // arbitrary defaults | 64 CSVFormat() : // arbitrary defaults |
64 m_modelType(TwoDimensionalModel), | 65 m_modelType(TwoDimensionalModel), |