summaryrefslogtreecommitdiffstats
path: root/sync/api/sync_error.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sync/api/sync_error.cc')
-rw-r--r--sync/api/sync_error.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/sync/api/sync_error.cc b/sync/api/sync_error.cc
index be2a457..307f339 100644
--- a/sync/api/sync_error.cc
+++ b/sync/api/sync_error.cc
@@ -18,7 +18,7 @@ SyncError::SyncError() {
SyncError::SyncError(const tracked_objects::Location& location,
const std::string& message,
- syncable::ModelType type) {
+ syncer::ModelType type) {
Init(location, message, type);
PrintLogError();
}
@@ -51,19 +51,19 @@ void SyncError::Copy(const SyncError& other) {
void SyncError::Clear() {
location_.reset();
message_ = std::string();
- type_ = syncable::UNSPECIFIED;
+ type_ = syncer::UNSPECIFIED;
}
void SyncError::Reset(const tracked_objects::Location& location,
const std::string& message,
- syncable::ModelType type) {
+ syncer::ModelType type) {
Init(location, message, type);
PrintLogError();
}
void SyncError::Init(const tracked_objects::Location& location,
const std::string& message,
- syncable::ModelType type) {
+ syncer::ModelType type) {
location_.reset(new tracked_objects::Location(location));
message_ = message;
type_ = type;
@@ -84,7 +84,7 @@ const std::string& SyncError::message() const {
return message_;
}
-syncable::ModelType SyncError::type() const {
+syncer::ModelType SyncError::type() const {
CHECK(IsSet());
return type_;
}
@@ -93,7 +93,7 @@ std::string SyncError::ToString() const {
if (!IsSet()) {
return std::string();
}
- return location_->ToString() + ", " + syncable::ModelTypeToString(type_) +
+ return location_->ToString() + ", " + syncer::ModelTypeToString(type_) +
", Sync Error: " + message_;
}
@@ -102,7 +102,7 @@ void SyncError::PrintLogError() const {
location_->line_number(),
logging::LOG_ERROR).stream(),
LOG_IS_ON(ERROR))
- << syncable::ModelTypeToString(type_) << ", Sync Error: " << message_;
+ << syncer::ModelTypeToString(type_) << ", Sync Error: " << message_;
}
void PrintTo(const SyncError& sync_error, std::ostream* os) {