aboutsummaryrefslogtreecommitdiff
path: root/src/server/bnetserver/Main.cpp
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2015-03-11 21:07:08 +0100
committerjackpoz <giacomopoz@gmail.com>2015-03-11 21:07:08 +0100
commitb35578bac3b1b53bc68304cbc1efeed327916037 (patch)
treeebf0311fc1f6b5ffdb56c3ad32c12d2a2bfed9a0 /src/server/bnetserver/Main.cpp
parent62e2d8e971b73310cf0727967bc0e23376353948 (diff)
Revert "Core/Server: Catch exceptions in int main()"
This reverts commit e68ca82d4d039a401d03de145111b0a738bb9dd7. Closes #14329
Diffstat (limited to 'src/server/bnetserver/Main.cpp')
-rw-r--r--src/server/bnetserver/Main.cpp19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/server/bnetserver/Main.cpp b/src/server/bnetserver/Main.cpp
index ab7c91512e2..5f4f63287e5 100644
--- a/src/server/bnetserver/Main.cpp
+++ b/src/server/bnetserver/Main.cpp
@@ -61,7 +61,7 @@ boost::asio::deadline_timer _dbPingTimer(_ioService);
uint32 _dbPingInterval;
LoginDatabaseWorkerPool LoginDatabase;
-int mainImpl(int argc, char** argv)
+int main(int argc, char** argv)
{
std::string configFile = _TRINITY_BNET_CONFIG;
auto vm = GetConsoleArguments(argc, argv, configFile);
@@ -156,23 +156,6 @@ int mainImpl(int argc, char** argv)
return 0;
}
-int main(int argc, char** argv)
-{
- try
- {
- return mainImpl(argc, argv);
- }
- catch (std::exception& ex)
- {
- std::cerr << "Top-level exception caught:" << ex.what() << "\n";
-
-#ifndef NDEBUG // rethrow exception for the debugger
- throw;
-#else
- return 1;
-#endif
- }
-}
/// Initialize connection to the database
bool StartDB()