Commit 15f9d779 authored by Thomas Ives's avatar Thomas Ives Committed by Thomas Braun
Browse files

client/devapi_macros.h: Remove pointless forward declarations 

We need to add the DbAttribute forward declaration about to Attribute.h.  We should
also explicitly include DbAttribute.h in Attribute.cpp.
parent 3d4cc0d9

src/include/tango/client/devapi_macros.h

+0 −30
Original line number Diff line number Diff line
@@ -25,23 +25,6 @@ 
namespace Tango

{



/** @defgroup Client Client classes */



//

// forward declarations

//



class DbDevice;

class DbAttribute;

class DbDevImportInfo;

class Database;

class AsynReq;

// NOLINTNEXTLINE(cppcoreguidelines-virtual-class-destructor)

class NotifdEventConsumer;

// NOLINTNEXTLINE(cppcoreguidelines-virtual-class-destructor)

class ZmqEventConsumer;

class CallBack;



//

// Some define

//
@@ -63,15 +46,6 @@ class CallBack; 
#define FROM_IOR "IOR"

#define NOT_USED "Unused"



///

///                    Some inline methods

///                    -------------------

///



//

// For Tango 8 ZMQ event system

//



///

///                    Some macros

///                    -----------
@@ -192,10 +166,6 @@ class CallBack; 
        A[i].events.arch_event.extensions[j] = B[i].event_prop.arch_event.extensions[j];      \

    }



///

///                 Small utility classes

///                    ---------------------



} // namespace Tango



#endif /* TANGO_CLIENT_DEVAPI_MACROS_H */

src/include/tango/server/Attribute.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ class AttrProperty; 
class DeviceClass;

class EncodedAttribute;

class EventSupplier;

class DbAttribute;



//=============================================================================

//

src/server/Attribute.cpp

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <tango/internal/server/attribute_utils.h>



#include <tango/client/Database.h>

#include <tango/client/DbAttribute.h>

#include <tango/server/AttrProperty.h>

#include <tango/server/AttrValue.h>

#include <tango/server/DeviceImpl.h>