Skip to content

Commit 6d6e7c2

Browse files
Stinkfist0Stinkfist0
committed
Unify IfcParse's dllimport/export macros with IfcGeom.
1 parent 3a507ca commit 6d6e7c2

24 files changed

+2546
-2546
lines changed

‎cmake/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ endforeach()
449449
set(IFCPARSE_FILES ${IFCPARSE_CPP_FILES} ${IFCPARSE_H_FILES})
450450

451451
add_library(IfcParse ${IFCPARSE_FILES})
452-
set_target_properties(IfcParse PROPERTIES COMPILE_FLAGS -DIfcParse_EXPORTS)
452+
set_target_properties(IfcParse PROPERTIES COMPILE_FLAGS -DIFC_PARSE_EXPORTS)
453453

454454
IF(UNICODE_SUPPORT)
455455
TARGET_LINK_LIBRARIES(IfcParse ${ICU_LIBRARIES} ${Boost_LIBRARIES})

‎src/ifcexpressparser/templates.py‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
2727
#include <boost/optional.hpp>
2828
29-
#include "../ifcparse/IfcParse_Export.h"
29+
#include "../ifcparse/ifc_parse_api.h"
3030
3131
#include "../ifcparse/IfcUtil.h"
3232
#include "../ifcparse/IfcException.h"
@@ -64,7 +64,7 @@
6464
#ifndef %(schema_name_upper)sENUM_H
6565
#define %(schema_name_upper)sENUM_H
6666
67-
#include "../ifcparse/IfcParse_Export.h"
67+
#include "../ifcparse/ifc_parse_api.h"
6868
6969
#include <boost/optional.hpp>
7070
@@ -76,10 +76,10 @@
7676
typedef enum {
7777
%(types)s, UNDEFINED
7878
} Enum;
79-
IfcParse_EXPORT boost::optional<Enum> Parent(Enum v);
80-
IfcParse_EXPORT Enum FromString(const std::string& s);
81-
IfcParse_EXPORT std::string ToString(Enum v);
82-
IfcParse_EXPORT bool IsSimple(Enum v);
79+
IFC_PARSE_API boost::optional<Enum> Parent(Enum v);
80+
IFC_PARSE_API Enum FromString(const std::string& s);
81+
IFC_PARSE_API std::string ToString(Enum v);
82+
IFC_PARSE_API bool IsSimple(Enum v);
8383
}
8484
8585
}
@@ -93,24 +93,24 @@
9393
9494
#define IfcSchema %(schema_name)s
9595
96-
#include "../ifcparse/IfcParse_Export.h"
96+
#include "../ifcparse/ifc_parse_api.h"
9797
#include "../ifcparse/IfcUtil.h"
9898
#include "../ifcparse/IfcEntityDescriptor.h"
9999
#include "../ifcparse/IfcWritableEntity.h"
100100
101101
namespace %(schema_name)s {
102102
namespace Type {
103-
IfcParse_EXPORT int GetAttributeCount(Enum t);
104-
IfcParse_EXPORT int GetAttributeIndex(Enum t, const std::string& a);
105-
IfcParse_EXPORT IfcUtil::ArgumentType GetAttributeType(Enum t, unsigned char a);
106-
IfcParse_EXPORT Enum GetAttributeEntity(Enum t, unsigned char a);
107-
IfcParse_EXPORT const std::string& GetAttributeName(Enum t, unsigned char a);
108-
IfcParse_EXPORT bool GetAttributeOptional(Enum t, unsigned char a);
109-
IfcParse_EXPORT bool GetAttributeDerived(Enum t, unsigned char a);
110-
IfcParse_EXPORT std::pair<const char*, int> GetEnumerationIndex(Enum t, const std::string& a);
111-
IfcParse_EXPORT std::pair<Enum, unsigned> GetInverseAttribute(Enum t, const std::string& a);
112-
IfcParse_EXPORT std::set<std::string> GetInverseAttributeNames(Enum t);
113-
IfcParse_EXPORT void PopulateDerivedFields(IfcWrite::IfcWritableEntity* e);
103+
IFC_PARSE_API int GetAttributeCount(Enum t);
104+
IFC_PARSE_API int GetAttributeIndex(Enum t, const std::string& a);
105+
IFC_PARSE_API IfcUtil::ArgumentType GetAttributeType(Enum t, unsigned char a);
106+
IFC_PARSE_API Enum GetAttributeEntity(Enum t, unsigned char a);
107+
IFC_PARSE_API const std::string& GetAttributeName(Enum t, unsigned char a);
108+
IFC_PARSE_API bool GetAttributeOptional(Enum t, unsigned char a);
109+
IFC_PARSE_API bool GetAttributeDerived(Enum t, unsigned char a);
110+
IFC_PARSE_API std::pair<const char*, int> GetEnumerationIndex(Enum t, const std::string& a);
111+
IFC_PARSE_API std::pair<Enum, unsigned> GetInverseAttribute(Enum t, const std::string& a);
112+
IFC_PARSE_API std::set<std::string> GetInverseAttributeNames(Enum t);
113+
IFC_PARSE_API void PopulateDerivedFields(IfcWrite::IfcWritableEntity* e);
114114
}}
115115
116116
#endif
@@ -357,7 +357,7 @@
357357
derived_field_statement_attrs = 'idxs.insert(%d); '
358358

359359
simpletype = """%(documentation)s
360-
class IfcParse_EXPORT %(name)s : public %(superclass)s {
360+
class IFC_PARSE_API %(name)s : public %(superclass)s {
361361
public:
362362
virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
363363
virtual Argument* getArgument(unsigned int i) const;
@@ -390,13 +390,13 @@ class IfcParse_EXPORT %(name)s : public %(superclass)s {
390390
enumeration = """namespace %(name)s {
391391
%(documentation)s
392392
typedef enum {%(values)s} %(name)s;
393-
IfcParse_EXPORT const char* ToString(%(name)s v);
394-
IfcParse_EXPORT %(name)s FromString(const std::string& s);
393+
IFC_PARSE_API const char* ToString(%(name)s v);
394+
IFC_PARSE_API %(name)s FromString(const std::string& s);
395395
}
396396
"""
397397

398398
entity = """%(documentation)s
399-
class IfcParse_EXPORT %(name)s %(superclass)s{
399+
class IFC_PARSE_API %(name)s %(superclass)s{
400400
public:
401401
%(attributes)s virtual unsigned int getArgumentCount() const { return %(argument_count)d; }
402402
virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const {%(argument_type_function_body)s}

‎src/ifcparse/Ifc2x3-latebound.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,24 @@
3131

3232
#define IfcSchema Ifc2x3
3333

34-
#include "../ifcparse/IfcParse_Export.h"
34+
#include "../ifcparse/ifc_parse_api.h"
3535
#include "../ifcparse/IfcUtil.h"
3636
#include "../ifcparse/IfcEntityDescriptor.h"
3737
#include "../ifcparse/IfcWritableEntity.h"
3838

3939
namespace Ifc2x3 {
4040
namespace Type {
41-
IfcParse_EXPORT int GetAttributeCount(Enum t);
42-
IfcParse_EXPORT int GetAttributeIndex(Enum t, const std::string& a);
43-
IfcParse_EXPORT IfcUtil::ArgumentType GetAttributeType(Enum t, unsigned char a);
44-
IfcParse_EXPORT Enum GetAttributeEntity(Enum t, unsigned char a);
45-
IfcParse_EXPORT const std::string& GetAttributeName(Enum t, unsigned char a);
46-
IfcParse_EXPORT bool GetAttributeOptional(Enum t, unsigned char a);
47-
IfcParse_EXPORT bool GetAttributeDerived(Enum t, unsigned char a);
48-
IfcParse_EXPORT std::pair<const char*, int> GetEnumerationIndex(Enum t, const std::string& a);
49-
IfcParse_EXPORT std::pair<Enum, unsigned> GetInverseAttribute(Enum t, const std::string& a);
50-
IfcParse_EXPORT std::set<std::string> GetInverseAttributeNames(Enum t);
51-
IfcParse_EXPORT void PopulateDerivedFields(IfcWrite::IfcWritableEntity* e);
41+
IFC_PARSE_API int GetAttributeCount(Enum t);
42+
IFC_PARSE_API int GetAttributeIndex(Enum t, const std::string& a);
43+
IFC_PARSE_API IfcUtil::ArgumentType GetAttributeType(Enum t, unsigned char a);
44+
IFC_PARSE_API Enum GetAttributeEntity(Enum t, unsigned char a);
45+
IFC_PARSE_API const std::string& GetAttributeName(Enum t, unsigned char a);
46+
IFC_PARSE_API bool GetAttributeOptional(Enum t, unsigned char a);
47+
IFC_PARSE_API bool GetAttributeDerived(Enum t, unsigned char a);
48+
IFC_PARSE_API std::pair<const char*, int> GetEnumerationIndex(Enum t, const std::string& a);
49+
IFC_PARSE_API std::pair<Enum, unsigned> GetInverseAttribute(Enum t, const std::string& a);
50+
IFC_PARSE_API std::set<std::string> GetInverseAttributeNames(Enum t);
51+
IFC_PARSE_API void PopulateDerivedFields(IfcWrite::IfcWritableEntity* e);
5252
}}
5353

5454
#endif

0 commit comments

Comments
 (0)