| 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 25baf6c3f5260da50bf7c990ef2b7b7ab933b829..e459a4a789e33425031cd13f07cec62389d408bb 100644
|
| --- a/sync/internal_api/public/base/model_type.h
|
| +++ b/sync/internal_api/public/base/model_type.h
|
| @@ -89,10 +89,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);
|
|
|