VirtualBox

Changeset 21085 in vbox


Ignore:
Timestamp:
Jun 30, 2009 5:05:03 PM (16 years ago)
Author:
vboxsync
Message:

Main: fix class import/export linkage by using RT_DECL_CLASS (r49346)

Location:
trunk/include
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/VBox/settings.h

    r21079 r21085  
    242242#pragma warning (disable:4251)
    243243#pragma warning (disable:4275)
     244#endif
     245
     246/** @def IN_VBOXXML_R3
     247 * Used to indicate whether we're inside the same link module as the
     248 * XML Settings File Manipulation API.
     249 *
     250 * @todo should go to a separate common include together with VBOXXML2_CLASS
     251 * once there becomes more than one header in the VBoxXML2 library.
     252 */
     253#ifdef DOXYGEN_RUNNING
     254# define IN_VBOXXML_R3
     255#endif
     256
     257/** @def VBOXXML_CLASS
     258 * Class export/import wrapper. */
     259#ifdef IN_VBOXXML_R3
     260# define VBOXXML_CLASS DECLEXPORT_CLASS
     261#else
     262# define VBOXXML_CLASS DECLIMPORT_CLASS
    244263#endif
    245264
  • trunk/include/iprt/xml_cpp.h

    r21079 r21085  
    4040#include <iprt/ministring_cpp.h>
    4141
    42 /** @def IN_VBOXXML_R3
    43  * Used to indicate whether we're inside the same link module as the
    44  * XML Settings File Manipulation API.
    45  *
    46  * @todo should go to a separate common include together with VBOXXML2_CLASS
    47  * once there becomes more than one header in the VBoxXML2 library.
    48  */
    49 #ifdef DOXYGEN_RUNNING
    50 # define IN_VBOXXML_R3
    51 #endif
    52 
    53 /** @def VBOXXML_CLASS
    54  * Class export/import wrapper. */
    55 #ifdef IN_VBOXXML_R3
    56 # define VBOXXML_CLASS DECLEXPORT_CLASS
    57 #else
    58 # define VBOXXML_CLASS DECLIMPORT_CLASS
    59 #endif
    60 
    6142/* Forwards */
    6243typedef struct _xmlParserInput xmlParserInput;
     
    7657 * Base exception class.
    7758 */
    78 class VBOXXML_CLASS Error : public std::exception
     59class RT_DECL_CLASS Error : public std::exception
    7960{
    8061public:
     
    11697};
    11798
    118 class VBOXXML_CLASS LogicError : public Error
     99class RT_DECL_CLASS LogicError : public Error
    119100{
    120101public:
     
    127108};
    128109
    129 class VBOXXML_CLASS RuntimeError : public Error
     110class RT_DECL_CLASS RuntimeError : public Error
    130111{
    131112public:
     
    136117};
    137118
    138 class VBOXXML_CLASS XmlError : public RuntimeError
     119class RT_DECL_CLASS XmlError : public RuntimeError
    139120{
    140121public:
     
    147128//////////////////////////////////////////////////////////////////////////////
    148129
    149 class VBOXXML_CLASS ENotImplemented : public LogicError
     130class RT_DECL_CLASS ENotImplemented : public LogicError
    150131{
    151132public:
     
    154135};
    155136
    156 class VBOXXML_CLASS EInvalidArg : public LogicError
     137class RT_DECL_CLASS EInvalidArg : public LogicError
    157138{
    158139public:
     
    161142};
    162143
    163 class VBOXXML_CLASS EDocumentNotEmpty : public LogicError
     144class RT_DECL_CLASS EDocumentNotEmpty : public LogicError
    164145{
    165146public:
     
    168149};
    169150
    170 class VBOXXML_CLASS ENodeIsNotElement : public LogicError
     151class RT_DECL_CLASS ENodeIsNotElement : public LogicError
    171152{
    172153public:
     
    178159//////////////////////////////////////////////////////////////////////////////
    179160
    180 class VBOXXML_CLASS ENoMemory : public RuntimeError, public std::bad_alloc
     161class RT_DECL_CLASS ENoMemory : public RuntimeError, public std::bad_alloc
    181162{
    182163public:
     
    185166};
    186167
    187 class VBOXXML_CLASS EIPRTFailure : public RuntimeError
     168class RT_DECL_CLASS EIPRTFailure : public RuntimeError
    188169{
    189170public:
     
    201182 * The Stream class is a base class for I/O streams.
    202183 */
    203 class VBOXXML_CLASS Stream
     184class RT_DECL_CLASS Stream
    204185{
    205186public:
     
    236217 * useful functionality.
    237218 */
    238 class VBOXXML_CLASS Input : virtual public Stream
     219class RT_DECL_CLASS Input : virtual public Stream
    239220{
    240221public:
     
    254235 *
    255236 */
    256 class VBOXXML_CLASS Output : virtual public Stream
     237class RT_DECL_CLASS Output : virtual public Stream
    257238{
    258239public:
     
    291272 * when reading from or writing to such File instances.
    292273 */
    293 class VBOXXML_CLASS File : public Input, public Output
     274class RT_DECL_CLASS File : public Input, public Output
    294275{
    295276public:
     
    374355 * memory buffer.
    375356 */
    376 class VBOXXML_CLASS MemoryBuf : public Input
     357class RT_DECL_CLASS MemoryBuf : public Input
    377358{
    378359public:
     
    409390typedef FNEXTERNALENTITYLOADER *PFNEXTERNALENTITYLOADER;
    410391
    411 class VBOXXML_CLASS GlobalLock
     392class RT_DECL_CLASS GlobalLock
    412393{
    413394public:
     
    454435class ContentNode;
    455436
    456 class VBOXXML_CLASS Node
     437class RT_DECL_CLASS Node
    457438{
    458439public:
     
    488469};
    489470
    490 class VBOXXML_CLASS ElementNode : public Node
     471class RT_DECL_CLASS ElementNode : public Node
    491472{
    492473public:
     
    516497};
    517498
    518 class VBOXXML_CLASS ContentNode : public Node
     499class RT_DECL_CLASS ContentNode : public Node
    519500{
    520501public:
     
    529510};
    530511
    531 class VBOXXML_CLASS AttributeNode : public Node
     512class RT_DECL_CLASS AttributeNode : public Node
    532513{
    533514public:
     
    547528 */
    548529
    549 class VBOXXML_CLASS NodesLoop
     530class RT_DECL_CLASS NodesLoop
    550531{
    551532public:
     
    565546 */
    566547
    567 class VBOXXML_CLASS Document
     548class RT_DECL_CLASS Document
    568549{
    569550public:
     
    594575 */
    595576
    596 class VBOXXML_CLASS XmlParserBase
     577class RT_DECL_CLASS XmlParserBase
    597578{
    598579protected:
     
    608589 */
    609590
    610 class VBOXXML_CLASS XmlFileParser : public XmlParserBase
     591class RT_DECL_CLASS XmlFileParser : public XmlParserBase
    611592{
    612593public:
     
    630611 */
    631612
    632 class VBOXXML_CLASS XmlFileWriter
     613class RT_DECL_CLASS XmlFileWriter
    633614{
    634615public:
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette