From 86ca9bd0f9dd39632c6217465972db78109688a2 Mon Sep 17 00:00:00 2001
From: Dennis Luxen <info@project-osrm.org>
Date: Wed, 28 Jan 2015 10:09:46 +0100
Subject: [PATCH] mark simple logger write function as noexcept.

---
 Util/simple_logger.cpp | 39 ++++++++++++++++-----------------------
 Util/simple_logger.hpp |  4 ++--
 util/simple_logger.cpp | 36 ++++++++++++++----------------------
 util/simple_logger.hpp |  4 ++--
 4 files changed, 34 insertions(+), 49 deletions(-)

diff --git a/Util/simple_logger.cpp b/Util/simple_logger.cpp
index 5d8821233..325684af9 100644
--- a/Util/simple_logger.cpp
+++ b/Util/simple_logger.cpp
@@ -78,34 +78,26 @@ std::mutex &SimpleLogger::get_mutex()
     return mtx;
 }
 
-std::ostringstream &SimpleLogger::Write(LogLevel lvl)
+std::ostringstream &SimpleLogger::Write(LogLevel lvl) noexcept
 {
     std::lock_guard<std::mutex> lock(get_mutex());
-    try
+    level = lvl;
+    os << "[";
+    switch (level)
     {
-        level = lvl;
-        os << "[";
-        switch (level)
-        {
-        case logWARNING:
-            os << "warn";
-            break;
-        case logDEBUG:
+    case logWARNING:
+        os << "warn";
+        break;
+    case logDEBUG:
 #ifndef NDEBUG
-            os << "debug";
+        os << "debug";
 #endif
-            break;
-        default: // logINFO:
-            os << "info";
-            break;
-        }
-        os << "] ";
-    }
-    catch (const std::exception &e)
-    {
-        // encapsulate in osrm::exception
-        throw osrm::exception(std::string(e.what()) + ", getting ostringstream");
+        break;
+    default: // logINFO:
+        os << "info";
+        break;
     }
+    os << "] ";
     return os;
 }
 
@@ -127,7 +119,8 @@ SimpleLogger::~SimpleLogger()
                       << std::endl;
 #endif
             break;
-        default: // logINFO:
+        case logINFO:
+        default:
             std::cout << os.str() << (is_terminal ? COL_RESET : "") << std::endl;
             break;
         }
diff --git a/Util/simple_logger.hpp b/Util/simple_logger.hpp
index 077fa2e41..f4dfc0b02 100644
--- a/Util/simple_logger.hpp
+++ b/Util/simple_logger.hpp
@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -64,7 +64,7 @@ class SimpleLogger
 
     virtual ~SimpleLogger();
     std::mutex &get_mutex();
-    std::ostringstream &Write(LogLevel l = logINFO);
+    std::ostringstream &Write(LogLevel l = logINFO) noexcept;
 
   private:
     std::ostringstream os;
diff --git a/util/simple_logger.cpp b/util/simple_logger.cpp
index 2f032300c..325684af9 100644
--- a/util/simple_logger.cpp
+++ b/util/simple_logger.cpp
@@ -78,34 +78,26 @@ std::mutex &SimpleLogger::get_mutex()
     return mtx;
 }
 
-std::ostringstream &SimpleLogger::Write(LogLevel lvl)
+std::ostringstream &SimpleLogger::Write(LogLevel lvl) noexcept
 {
     std::lock_guard<std::mutex> lock(get_mutex());
-    try
+    level = lvl;
+    os << "[";
+    switch (level)
     {
-        level = lvl;
-        os << "[";
-        switch (level)
-        {
-        case logWARNING:
-            os << "warn";
-            break;
-        case logDEBUG:
+    case logWARNING:
+        os << "warn";
+        break;
+    case logDEBUG:
 #ifndef NDEBUG
-            os << "debug";
+        os << "debug";
 #endif
-            break;
-        default: // logINFO:
-            os << "info";
-            break;
-        }
-        os << "] ";
-    }
-    catch (const std::exception &e)
-    {
-        // encapsulate in osrm::exception
-        throw osrm::exception(std::string(e.what()) + ", getting ostringstream");
+        break;
+    default: // logINFO:
+        os << "info";
+        break;
     }
+    os << "] ";
     return os;
 }
 
diff --git a/util/simple_logger.hpp b/util/simple_logger.hpp
index 077fa2e41..f4dfc0b02 100644
--- a/util/simple_logger.hpp
+++ b/util/simple_logger.hpp
@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -64,7 +64,7 @@ class SimpleLogger
 
     virtual ~SimpleLogger();
     std::mutex &get_mutex();
-    std::ostringstream &Write(LogLevel l = logINFO);
+    std::ostringstream &Write(LogLevel l = logINFO) noexcept;
 
   private:
     std::ostringstream os;