[Libreoffice-commits] online.git: loolwsd/DocumentBroker.hpp loolwsd/LOOLKit.cpp loolwsd/LOOLWSD.cpp loolwsd/Unit.hpp loolwsd/Util.cpp

[Miklos Vajna]

 loolwsd/DocumentBroker.hpp |    2 +-
 loolwsd/LOOLKit.cpp        |    4 ++--
 loolwsd/LOOLWSD.cpp        |    8 ++++----
 loolwsd/Unit.hpp           |    2 +-
 loolwsd/Util.cpp           |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit e4bbc1513258d7d8ee50d93527439abdd0ea86ed
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Aug 30 09:06:39 2016 +0200

    Avoid inclusion of deprecated C++ headers
    
    Change-Id: I29abf3feeb8419f4e15ccb8dc7c34c086696ce07

diff --git a/loolwsd/DocumentBroker.hpp b/loolwsd/DocumentBroker.hpp
index e404e82..54ca138 100644
--- a/loolwsd/DocumentBroker.hpp
+++ b/loolwsd/DocumentBroker.hpp
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_DOCUMENTBROKER_HPP
 #define INCLUDED_DOCUMENTBROKER_HPP
 
-#include <signal.h>
+#include <csignal>
 
 #include <atomic>
 #include <chrono>
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 39e98e7..44b8b2c 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -13,9 +13,9 @@
 
 #include <dlfcn.h>
 #include <ftw.h>
-#include <limits.h>
+#include <climits>
 #include <malloc.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/capability.h>
 #include <unistd.h>
 #include <utime.h>
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 21e867b..0de8e73 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -24,16 +24,16 @@
 // parent process that listens on the TCP port and accepts connections from LOOL clients, and a
 // number of child processes, each which handles a viewing (editing) session for one document.
 
-#include <errno.h>
-#include <locale.h>
+#include <cerrno>
+#include <clocale>
 #include <unistd.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#include <time.h>
-#include <stdlib.h>
+#include <ctime>
+#include <cstdlib>
 
 #include <cassert>
 #include <condition_variable>
diff --git a/loolwsd/Unit.hpp b/loolwsd/Unit.hpp
index 1fdec4c..f32047b 100644
--- a/loolwsd/Unit.hpp
+++ b/loolwsd/Unit.hpp
@@ -12,7 +12,7 @@
 #include <string>
 #include <memory>
 #include <atomic>
-#include <assert.h>
+#include <cassert>
 
 #include <Poco/Net/WebSocket.h>
 
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index 328957e..6599959 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -11,7 +11,7 @@
 #include "config.h"
 
 #include <execinfo.h>
-#include <signal.h>
+#include <csignal>
 #include <sys/poll.h>
 #include <sys/prctl.h>
 #include <sys/uio.h>