[Libreoffice-commits] online.git: common/Log.cpp common/Log.hpp

[Tor Lillqvist (via logerrit)]

 common/Log.cpp |    2 +-
 common/Log.hpp |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f89264047c17b362ebab8ff96ad2e01ac63bacec
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Sep 16 12:29:22 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Sep 16 13:32:57 2019 +0200

    Fix build failure in the MOBILEAPP case
    
    We never exit an app process intentionally, so Log::isShutdownCalled()
    can always return false.
    
    Change-Id: I6b3cce85ccac5e3ffbb7b29ca552cb9e4441df2a
    Reviewed-on: https://gerrit.libreoffice.org/78979
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/common/Log.cpp b/common/Log.cpp
index 0153eff14..18a0137f5 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -225,12 +225,12 @@ namespace Log
         std::flush(std::cerr);
         fflush(stderr);
     }
-#endif
 
     bool isShutdownCalled()
     {
         return IsShutdown;
     }
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Log.hpp b/common/Log.hpp
index 6bf85129e..df0a06536 100644
--- a/common/Log.hpp
+++ b/common/Log.hpp
@@ -61,6 +61,8 @@ namespace Log
     void shutdown();
     /// Was static shutdown() called? If so, producing more logs should be avoided.
     bool isShutdownCalled();
+#else
+    constexpr bool isShutdownCalled() { return false; }
 #endif
 
     char* prefix(char* buffer, std::size_t len, const char* level);