Changeset 8091

Timestamp:

16/10/11 18:20:44 (7 months ago)

Author:

westram

Message:

• added template IGNORE_RESULT(), to ignore results tagged with __ATTR__USERESULT

Location:

branches/ptpan_back

Files:

• AISC_COM/C/aisc_extern.c (modified) (1 diff)
• AISC_COM/C/aisc_server.h (modified) (1 diff)
• AISC_COM/C/server.c (modified) (1 diff)
• AISC_COM/C/server.h (modified) (1 diff)
• NALIGNER/ali_other_stuff.hxx (modified) (1 diff)
• NAMES_COM/names_extern.c (modified) (1 diff)
• PROBE_COM/PT_extern.c (modified) (1 diff)
• TEMPLATES/attributes.h (modified) (1 diff)

branches/ptpan_back/AISC_COM/C/aisc_extern.c

@@ -2 +2 @@
 #include <string.h>
 #include <aisc.h>
+#include <attributes.h>
 #include <server.h>
 #include "aisc_extern_privat.h"

branches/ptpan_back/AISC_COM/C/aisc_server.h

@@ -12 +12 @@
 #include <aisc_com.h>
 
+#ifndef ATTRIBUTES_H
+#include <attributes.h>
+#endif
 #include <server.h>
 #include <aisc_server_proto.h>

branches/ptpan_back/AISC_COM/C/server.c

@@ -29 +29 @@
 #include "aisc_com.h"
 // AISC_MKPT_PROMOTE:#include <aisc_func_types.h>
+#include <attributes.h>
 #include "server.h"
 #include "aisc_global.h"

branches/ptpan_back/AISC_COM/C/server.h

@@ -8 +8 @@
 /* define ARB attributes: */
 #ifndef ATTRIBUTES_H
-# include <attributes.h>
+#error You have to include attributes.h before including server.h
+// it's not possible to include attributes here due to link problems 
 #endif
 

branches/ptpan_back/NALIGNER/ali_other_stuff.hxx

@@ -12 +12 @@
 #define ALI_OTHER_STUFF_HXX
 
+#ifndef PT_COM_H
 #include <PT_com.h>
-
+#endif
+#ifndef ATTRIBUTES_H
+#include <attributes.h>
+#endif
+#ifndef SERVER_H
 extern "C" {
 #include <server.h>
 }
-
+#endif
+#ifndef ARBDBT_H
 #include <arbdbt.h>
+#endif
+#ifndef SERVERCNTRL_H
 #include <servercntrl.h>
+#endif
 
 #else

branches/ptpan_back/NAMES_COM/names_extern.c

@@ -4 +4 @@
 
 struct sigcontext;
+#include <attributes.h>
 #include "C/server.h"
 

branches/ptpan_back/PROBE_COM/PT_extern.c

@@ -3 +3 @@
 #include <cstring>
 #include "PT_server.h"
+#include <attributes.h>
 #include "C/server.h"
 #include <aisc_server_proto.h>

branches/ptpan_back/TEMPLATES/attributes.h

@@ -101 +101 @@
 
 // ------------------------------------------------------------
+// casting result to void does not help when a function is
+// declared with __ATTR__USERESULT. Use
+
+#ifdef __cplusplus
+template <typename T> void IGNORE_RESULT(const T&) {}
+#endif
+
+// ------------------------------------------------------------
 // helper macros to declare attributed function prototype and
 // start function definition in one line (static or inline functions only)