Changeset 6420 for trunk/licq

Show
Ignore:
Timestamp:
07/04/08 06:48:39 (5 months ago)
Author:
flynd
Message:

It seems deprecated attribute needs to be last for constructors to work on some compilers.

Location:
trunk/licq/include
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/licq/include/licq_message.h

    r6418 r6420  
    221221 
    222222  // Deprecated functions, to be removed 
    223   LICQ_DEPRECATED CEventAdded(unsigned long _nUin, const char *_szAlias, const char *_szFirstName, 
    224                const char *_szLastName, const char *_szEmail, 
    225                unsigned short _nCommand, time_t _tTime, unsigned long _nFlags); 
     223  CEventAdded(unsigned long _nUin, const char* _szAlias, 
     224      const char* _szFirstName, const char *_szLastName, const char *_szEmail, 
     225      unsigned short _nCommand, time_t _tTime, unsigned long _nFlags) 
     226      LICQ_DEPRECATED; 
    226227  LICQ_DEPRECATED unsigned long Uin() const { return strtoul(m_szId, NULL, 10); }; 
    227228 
    … …  
    253254 
    254255  // Deprecated functions, to be removed 
    255   LICQ_DEPRECATED CEventAuthRequest(unsigned long _nUin, const char *_szAlias, const char *_szFirstName, 
    256                  const char *_szLastName, const char *_szEmail, const char *_szReason, 
    257                  unsigned short _nCommand, time_t _tTime, unsigned long _nFlags); 
     256  CEventAuthRequest(unsigned long _nUin, const char* _szAlias, 
     257      const char* _szFirstName, const char* _szLastName, const char* _szEmail, 
     258      const char* _szReason, unsigned short _nCommand, time_t _tTime, 
     259      unsigned long _nFlags) LICQ_DEPRECATED; 
    258260  LICQ_DEPRECATED unsigned long Uin() const { return strtoul(m_szId, NULL, 10); }; 
    259261 
    … …  
    283285 
    284286  // Deprecated functions, to be removed 
    285   LICQ_DEPRECATED CEventAuthGranted(unsigned long _nUin, const char *_szMessage, 
    286               unsigned short _nCommand, time_t _tTime, unsigned long _nFlags); 
     287  CEventAuthGranted(unsigned long _nUin, const char* _szMessage, 
     288      unsigned short _nCommand, time_t _tTime, unsigned long _nFlags) 
     289      LICQ_DEPRECATED; 
    287290  LICQ_DEPRECATED unsigned long Uin() const { return strtoul(m_szId, NULL, 10); }; 
    288291 
    … …  
    308311 
    309312  // Deprecated functions, to be removed 
    310   LICQ_DEPRECATED CEventAuthRefused(unsigned long _nUin, const char *_szMessage, 
    311               unsigned short _nCommand, time_t _tTime, unsigned long _nFlags); 
     313  CEventAuthRefused(unsigned long _nUin, const char* _szMessage, 
     314      unsigned short _nCommand, time_t _tTime, unsigned long _nFlags) 
     315      LICQ_DEPRECATED; 
    312316  LICQ_DEPRECATED unsigned long Uin() const { return strtoul(m_szId, NULL, 10); }; 
    313317 
    … …  
    366370 
    367371  // Deprecated functions, to be removed 
    368   LICQ_DEPRECATED CContact(unsigned long n, const char *a); 
     372  CContact(unsigned long n, const char* a) LICQ_DEPRECATED; 
    369373  LICQ_DEPRECATED unsigned long Uin() const { return strtoul(m_szId, NULL, 10); } 
    370374 

  • trunk/licq/include/licq_user.h

    r6417 r6420  
    921921 
    922922  // Deprecated functions, to be removed 
    923   LICQ_DEPRECATED ICQUser(unsigned long id, char *filename); 
    924   LICQ_DEPRECATED ICQUser(unsigned long id); 
     923  ICQUser(unsigned long id, char *filename) LICQ_DEPRECATED; 
     924  ICQUser(unsigned long id) LICQ_DEPRECATED; 
    925925  LICQ_DEPRECATED unsigned long Uin() const; 
    926926  LICQ_DEPRECATED const char* UinString() const { return m_szId; }