Merge pull request #84 from nickbroon/random_fixes

Couple of small fixes

CMakeLists.txt

@@ -23,7 +23,7 @@ PROJECT(VERMONT)
 ### CMake configuration
 
 # allow building with old CMake. Use some bundled modules as a fallback
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
 
 # TODO: Once all warnings are fixed add -Werror to both of these
@@ -68,15 +68,6 @@ SUBDIRS(
 	src
 )
 
-if(COMMAND cmake_policy)
-	cmake_policy(SET CMP0003 OLD)
-	cmake_policy(SET CMP0002 OLD)
-	if (POLICY CMP0017)
-	    cmake_policy(SET CMP0017 OLD)
-	endif(POLICY CMP0017)
-endif(COMMAND cmake_policy)
-
-
 ADD_EXECUTABLE(vermont
 	src/vermont.cc
 )

src/modules/ipfix/IpfixReceiverZmq.cpp

@@ -41,7 +41,7 @@ IpfixReceiverZmq::IpfixReceiverZmq(std::vector<std::string> endpoints,
 	: endpoints(endpoints), channels(channels),
 	  zmq_high_watermark(zmq_high_watermark),
 	  zmq_poll_timeout(zmq_poll_timeout),
-	  statReceivedPackets(0), moduleId(moduleId)
+	  statReceivedPackets(0)
 {
 	if (endpoints.empty()) {
 		THROWEXCEPTION("No ZMQ channels configured, cannot start ZMQ Receiver");

src/modules/ipfix/IpfixReceiverZmq.hpp

@@ -57,7 +57,7 @@ private:
 	std::vector<zsock_t *> zmq_sockets;
 	zpoller_t *zpoller;
 	uint32_t statReceivedPackets;  /**< number of received packets */
-	unsigned int moduleId;
+
 };
 
 #endif // ZMQ_SUPPORT_ENABLED