| Index: sync/internal_api/public/base/model_type.h
|
| diff --git a/sync/internal_api/public/base/model_type.h b/sync/internal_api/public/base/model_type.h
|
| index 2c4613e9e62ea54e9df151cfd605d6a41701ab75..20c8ffa19d0a37d860e9170c706d7e58dca0bcba 100644
|
| --- a/sync/internal_api/public/base/model_type.h
|
| +++ b/sync/internal_api/public/base/model_type.h
|
| @@ -93,10 +93,10 @@ enum ModelType {
|
| MODEL_TYPE_COUNT,
|
| };
|
|
|
| -typedef syncer::EnumSet<
|
| - ModelType, FIRST_REAL_MODEL_TYPE, LAST_REAL_MODEL_TYPE> ModelTypeSet;
|
| -typedef syncer::EnumSet<
|
| - ModelType, UNSPECIFIED, LAST_REAL_MODEL_TYPE> FullModelTypeSet;
|
| +typedef EnumSet<ModelType, FIRST_REAL_MODEL_TYPE, LAST_REAL_MODEL_TYPE>
|
| + ModelTypeSet;
|
| +typedef EnumSet<ModelType, UNSPECIFIED, LAST_REAL_MODEL_TYPE>
|
| + FullModelTypeSet;
|
|
|
| inline ModelType ModelTypeFromInt(int i) {
|
| DCHECK_GE(i, 0);
|
|
|