aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/debug.cpp2
-rw-r--r--src/serverenvironment.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/debug.cpp b/src/debug.cpp
index 1a467265c..3c82ed9e1 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -69,7 +69,7 @@ void fatal_error_fn(const char *msg, const char *file,
errorstream << std::endl << "In thread " << std::hex
<< std::this_thread::get_id() << ":" << std::endl;
errorstream << file << ":" << line << ": " << function
- << ": A fatal error occured: " << msg << std::endl;
+ << ": A fatal error occurred: " << msg << std::endl;
abort();
}
diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
index 4e75a7c80..076a1e28f 100644
--- a/src/serverenvironment.cpp
+++ b/src/serverenvironment.cpp
@@ -2149,7 +2149,7 @@ bool ServerEnvironment::migratePlayersDatabase(const GameParams &game_params,
delete dstdb;
} catch (BaseException &e) {
- errorstream << "An error occured during migration: " << e.what() << std::endl;
+ errorstream << "An error occurred during migration: " << e.what() << std::endl;
return false;
}
return true;
@@ -2236,7 +2236,7 @@ bool ServerEnvironment::migrateAuthDatabase(
}
} catch (BaseException &e) {
- errorstream << "An error occured during migration: " << e.what()
+ errorstream << "An error occurred during migration: " << e.what()
<< std::endl;
return false;
}