Changeset 6397 for trunk/licq/include/licq_user.h

Timestamp:

07/02/08 22:11:16 (5 months ago)

Author:

flynd

Message:

Use a define to mark deprecated functions as the attribute is not supported by all compilers. Conditions for define was taken from Qt 4.4.0 headers.

Files:

• trunk/licq/include/licq_user.h (modified) (2 diffs)

trunk/licq/include/licq_user.h

@@ -17 +17 @@
 // Added for plugin convenience
 #include "licq_constants.h"
+
+// Define for marking functions as deprecated
+#ifndef LICQ_DEPRECATED
+# if defined(__GNUC__) && !defined(__INTEL_COMPILER) && (__GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2))
+#  define LICQ_DEPRECATED __attribute__ ((__deprecated__))
+# elif defined(_MSC_VER) && (_MSC_VER >= 1300)
+#  define LICQ_DEPRECATED __declspec(deprecated)
+# else
+#  define LICQ_DEPRECATED
+# endif
+#endif
 
 class TCPSocket;
@@ -1288 +1299 @@
 
   // Deprecated owner functions, to be removed
-  void SetOwnerUin(unsigned long _nUin) __attribute__ ((deprecated));
-  unsigned long OwnerUin() __attribute__ ((deprecated)) { return icqOwnerUin(); }
-  ICQOwner *FetchOwner(unsigned short) __attribute__ ((deprecated));
-  void DropOwner() __attribute__ ((deprecated));
-  void DropOwner(unsigned long) __attribute__ ((deprecated));
+  void SetOwnerUin(unsigned long _nUin) LICQ_DEPRECATED;
+  unsigned long OwnerUin() LICQ_DEPRECATED { return icqOwnerUin(); }
+  ICQOwner *FetchOwner(unsigned short) LICQ_DEPRECATED;
+  void DropOwner() LICQ_DEPRECATED;
+  void DropOwner(unsigned long) LICQ_DEPRECATED;
 
   /**