Merge pull request #711 from bourtemb/delleceste-openbsd-fix-706

Fix compilation errors on OpenBSD (#706)

Author: t-b

cpp_test_suite/old_tests/lock.cpp

@@ -9,7 +9,7 @@
 #include <process.h>
 #define WEXITSTATUS(w) w
 #else
-#include <wait.h>
+#include <sys/wait.h>
 #endif
 
 #include "locked_device_cmd.h"

cppapi/client/lockthread.h

@@ -66,7 +66,7 @@ struct LockedDevice
 	std::string			dev_name;		// The locked device name
 	DevLong			validity;		// The locked device validity
 
-	bool operator<(LockedDevice &arg) {return validity < arg.validity;}
+	bool operator<(const LockedDevice &arg) const {return validity < arg.validity;} 
 };
 
 enum LockCmdType

cppapi/client/zmqeventconsumer.cpp

@@ -50,6 +50,7 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <arpa/inet.h>
+#include <netinet/in.h> // Needed for systems that do not include this file from arpa/inet.h
 #endif
 
 using namespace CORBA;
@@ -4103,4 +4104,3 @@ void DelayEvent::release()
 }
 
 } /* End of Tango namespace */
-

cppapi/server/attribute.cpp

@@ -1282,7 +1282,7 @@ void Attribute::build_check_enum_labels(std::string &labs)
 
 void Attribute::add_startup_exception(std::string prop_name,const DevFailed &except)
 {
-	startup_exceptions.insert(std::pair<std::string,const DevFailed>(prop_name,except));
+	startup_exceptions.insert(std::pair<std::string, DevFailed>(prop_name,except));
 	check_startup_exceptions = true;
 }
 
@@ -1306,7 +1306,7 @@ void Attribute::delete_startup_exception(std::string prop_name,std::string dev_n
 {
 	if(check_startup_exceptions == true)
 	{
-		std::map<std::string,const DevFailed>::iterator it = startup_exceptions.find(prop_name);
+		std::map<std::string, DevFailed>::iterator it = startup_exceptions.find(prop_name);
 		if(it != startup_exceptions.end())
 			startup_exceptions.erase(it);
 		if(startup_exceptions.empty() == true)

cppapi/server/attribute.h

@@ -2514,7 +2514,7 @@ class Attribute
     std::vector<std::string>      mcast_event;                    // In case of multicasting used for event transport
     AttrQuality         old_quality;                    // Previous attribute quality
     std::bitset<numFlags>    old_alarm;                      // Previous attribute alarm
-    std::map<std::string,const DevFailed> startup_exceptions;		// Map containing exceptions related to attribute configuration raised during the server startup sequence
+    std::map<std::string, DevFailed> startup_exceptions;		// Map containing exceptions related to attribute configuration raised during the server startup sequence
     bool 				check_startup_exceptions;		// Flag set to true if there is at least one exception in startup_exceptions map
     bool 				startup_exceptions_clear;		// Flag set to true when the cause for the device startup exceptions has been fixed
 	bool				att_mem_exception;				// Flag set to true if the attribute is writable and
@@ -2570,7 +2570,7 @@ inline void Attribute::throw_startup_exception(const char* origin)
 		std::string err_msg;
 		std::vector<std::string> event_exceptions;
 		std::vector<std::string> opt_exceptions;
-		for(std::map<std::string,const DevFailed>::iterator it = startup_exceptions.begin(); it != startup_exceptions.end(); ++it)
+		for(std::map<std::string, DevFailed>::const_iterator it = startup_exceptions.begin(); it != startup_exceptions.end(); ++it)
 		{
 			if(it->first == "event_period" || it->first == "archive_period" || it->first == "rel_change" || it->first == "abs_change" || it->first == "archive_rel_change" || it->first == "archive_abs_change")
 				event_exceptions.push_back(it->first);

cppapi/server/dserversignal.cpp

@@ -269,15 +269,6 @@ void DServerSignal::register_class_signal(long signo,bool handler,DeviceClass *c
 				        (const char *)"DServerSignal::register_class_signal");
 	}
 
-	if (auth_signal(signo) == false)
-	{
-		TangoSys_OMemStream o;
-		o << "Signal " << sig_name[signo] << "is not authorized with your OS" << std::ends;
-		Except::throw_exception((const char *)API_SignalOutOfRange,
-				        o.str(),
-				        (const char *)"DServerSignal::register_class_signal");
-	}
-
 #ifndef _TG_WINDOWS_
 	if ((auto_signal(signo) == true) && (handler == true))
 	{
@@ -385,15 +376,6 @@ void DServerSignal::register_dev_signal(long signo,bool handler,DeviceImpl *dev_
 				      (const char *)"DServerSignal::register_dev_signal");
 	}
 
-	if (auth_signal(signo) == false)
-	{
-		TangoSys_OMemStream o;
-		o << "Signal " << sig_name[signo] << "is not authorized with your OS" << std::ends;
-		Except::throw_exception((const char *)API_SignalOutOfRange,
-				      o.str(),
-				      (const char *)"DServerSignal::register_dev_signal");
-	}
-
 #ifndef _TG_WINDOWS_
 	if ((auto_signal(signo) == true) && (handler == true))
 	{

cppapi/server/dserversignal.h

@@ -150,14 +150,6 @@ protected :
 	}
 #endif
 
-#if (defined __GLIBC__ || defined __darwin__ || defined __freebsd__)
-	static inline bool auth_signal(TANGO_UNUSED(long s)) {return true;}
-#endif
-
-#ifdef _TG_WINDOWS_
-	static inline bool auth_signal(long s) {return true;}
-#endif
-
 	static std::string 			sig_name[_NSIG];
 
 };

log4tango/include/log4tango/LoggingEvent.hh

@@ -30,6 +30,7 @@
 
 #include <log4tango/Portability.hh>
 #include <string>
+#include <thread>
 
 #include <log4tango/Level.hh>
 #include <log4tango/TimeStamp.hh>
@@ -92,7 +93,7 @@ public:
   std::string thread_name;
 
   /** id of thread in which this logging event was generated */
-  long thread_id;
+  std::thread::id thread_id;
 
   /** The number of seconds elapsed since the epoch 
       (1/1/1970 00:00:00 UTC) until logging event was created. */

log4tango/include/log4tango/threading/MSThreads.hh

@@ -66,8 +66,6 @@ namespace threading {
 
 std::string get_thread_id (void);
 
-long thread_id (void);
-
 //-----------------------------------------------------------------------------
 // Class : MSMutex 
 //-----------------------------------------------------------------------------      

log4tango/include/log4tango/threading/PThreads.hh

@@ -40,8 +40,6 @@ namespace threading {
 
 std::string get_thread_id (void);
 
-long thread_id (void);
-
 //-----------------------------------------------------------------------------
 // Class : Mutex
 //-----------------------------------------------------------------------------