Unified log4cpp headers and suppressed deprecation errors. Closes #805

src/afpacket_plugin/afpacket_collector.cpp

@@ -1,12 +1,4 @@
-// log4cpp logging facility
+#include "../all_logcpp_libraries.h"
-#include "log4cpp/Appender.hh"
-#include "log4cpp/BasicLayout.hh"
-#include "log4cpp/Category.hh"
-#include "log4cpp/FileAppender.hh"
-#include "log4cpp/Layout.hh"
-#include "log4cpp/OstreamAppender.hh"
-#include "log4cpp/PatternLayout.hh"
-#include "log4cpp/Priority.hh"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/version.hpp>

src/all_logcpp_libraries.h

@@ -0,0 +1,19 @@
+#ifdef __GNUC__
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored "-Wdeprecated"
+#endif
+
+#include <log4cpp/Appender.hh>
+#include <log4cpp/BasicLayout.hh>
+#include <log4cpp/Category.hh>
+#include <log4cpp/FileAppender.hh>
+#include <log4cpp/Layout.hh>
+#include <log4cpp/OstreamAppender.hh>
+#include <log4cpp/PatternLayout.hh>
+#include <log4cpp/Priority.hh>
+#include <log4cpp/RemoteSyslogAppender.hh>
+#include <log4cpp/SyslogAppender.hh>
+
+#ifdef __GNUC__
+  #pragma GCC diagnostic pop
+#endif

src/example_plugin/example_collector.cpp

@@ -1,12 +1,4 @@
-// log4cpp logging facility
+#include "../all_logcpp_libraries.h"
-#include "log4cpp/Appender.hh"
-#include "log4cpp/BasicLayout.hh"
-#include "log4cpp/Category.hh"
-#include "log4cpp/FileAppender.hh"
-#include "log4cpp/Layout.hh"
-#include "log4cpp/OstreamAppender.hh"
-#include "log4cpp/PatternLayout.hh"
-#include "log4cpp/Priority.hh"
 
 // For support uint32_t, uint16_t
 #include <sys/types.h>

src/fast_library.cpp

@@ -13,14 +13,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "log4cpp/Appender.hh"
+#include "all_logcpp_libraries.h"
-#include "log4cpp/BasicLayout.hh"
-#include "log4cpp/Category.hh"
-#include "log4cpp/FileAppender.hh"
-#include "log4cpp/Layout.hh"
-#include "log4cpp/OstreamAppender.hh"
-#include "log4cpp/PatternLayout.hh"
-#include "log4cpp/Priority.hh"
 
 #include <boost/asio.hpp>
 

src/fastnetmon.cpp

@@ -89,18 +89,7 @@
 
 #include <boost/program_options.hpp>
 
-// log4cpp logging facility
+#include "all_logcpp_libraries.h"
-#include "log4cpp/Appender.hh"
-#include "log4cpp/BasicLayout.hh"
-#include "log4cpp/Category.hh"
-#include "log4cpp/FileAppender.hh"
-#include "log4cpp/Layout.hh"
-#include "log4cpp/OstreamAppender.hh"
-#include "log4cpp/PatternLayout.hh"
-#include "log4cpp/Priority.hh"
-#include "log4cpp/RemoteSyslogAppender.hh"
-#include "log4cpp/SyslogAppender.hh"
-
 
 // Boost libs
 #include <boost/algorithm/string.hpp>

src/fastnetmon_actions.h

@@ -1,11 +1,4 @@
-#include "log4cpp/Appender.hh"
+#include "all_logcpp_libraries.h"
-#include "log4cpp/BasicLayout.hh"
-#include "log4cpp/Category.hh"
-#include "log4cpp/FileAppender.hh"
-#include "log4cpp/Layout.hh"
-#include "log4cpp/OstreamAppender.hh"
-#include "log4cpp/PatternLayout.hh"
-#include "log4cpp/Priority.hh"
 
 #include "fast_library.h"
 

src/netflow_plugin/netflow_collector.cpp

@@ -16,15 +16,7 @@
 #include "../fast_library.h"
 #include "../ipfix_rfc.h"
 
-// log4cpp logging facility
+#include "../all_logcpp_libraries.h"
-#include "log4cpp/Appender.hh"
-#include "log4cpp/BasicLayout.hh"
-#include "log4cpp/Category.hh"
-#include "log4cpp/FileAppender.hh"
-#include "log4cpp/Layout.hh"
-#include "log4cpp/OstreamAppender.hh"
-#include "log4cpp/PatternLayout.hh"
-#include "log4cpp/Priority.hh"
 
 #ifdef ENABLE_LUA_HOOKS
 #include <luajit-2.0/lua.hpp>

src/netmap_plugin/netmap_collector.cpp

@@ -1,12 +1,4 @@
-// log4cpp logging facility
+#include "../all_logcpp_libraries.h"
-#include "log4cpp/Appender.hh"
-#include "log4cpp/BasicLayout.hh"
-#include "log4cpp/Category.hh"
-#include "log4cpp/FileAppender.hh"
-#include "log4cpp/Layout.hh"
-#include "log4cpp/OstreamAppender.hh"
-#include "log4cpp/PatternLayout.hh"
-#include "log4cpp/Priority.hh"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/version.hpp>

src/pcap_plugin/pcap_collector.cpp

@@ -17,15 +17,7 @@
 #include <netinet/udp.h>
 #include <pcap.h>
 
-// log4cpp logging facility
+#include "../all_logcpp_libraries.h"
-#include "log4cpp/Appender.hh"
-#include "log4cpp/BasicLayout.hh"
-#include "log4cpp/Category.hh"
-#include "log4cpp/FileAppender.hh"
-#include "log4cpp/Layout.hh"
-#include "log4cpp/OstreamAppender.hh"
-#include "log4cpp/PatternLayout.hh"
-#include "log4cpp/Priority.hh"
 
 #include "pcap_collector.h"
 

src/sflow_plugin/sflow_collector.cpp

@@ -23,15 +23,7 @@
 #include <string.h>
 #include <sys/socket.h>
 
-// log4cpp logging facility
+#include "../all_logcpp_libraries.h"
-#include "log4cpp/Appender.hh"
-#include "log4cpp/BasicLayout.hh"
-#include "log4cpp/Category.hh"
-#include "log4cpp/FileAppender.hh"
-#include "log4cpp/Layout.hh"
-#include "log4cpp/OstreamAppender.hh"
-#include "log4cpp/PatternLayout.hh"
-#include "log4cpp/Priority.hh"
 
 #ifdef ENABLE_LUA_HOOKS
 lua_State* sflow_lua_state = NULL;