Fix exports

include/base_set.h

@@ -27,7 +27,7 @@
 #include <dynamic_bitset.h>
 
 #include <core/kicad_algo.h>
-#include <import_export.h>
+#include <kicommon.h>
 
 #if defined( _MSC_VER )
 // ssize_t is a POSIX extension
@@ -37,10 +37,10 @@
 typedef SSIZE_T ssize_t;
 #endif
 
-class APIEXPORT BASE_SET : public sul::dynamic_bitset<uint64_t>
+class KICOMMON_API BASE_SET : public sul::dynamic_bitset<uint64_t>
 {
 public:
-    class iterator
+    class KICOMMON_API iterator
     {
     public:
         using iterator_category = std::random_access_iterator_tag;
@@ -71,7 +71,7 @@ public:
         size_t    m_pos;
     };
 
-    class const_iterator
+    class KICOMMON_API const_iterator
     {
     public:
         using iterator_category = std::random_access_iterator_tag;
@@ -215,7 +215,7 @@ public:
     }
 
     // Custom iterator to iterate over set bits
-    class set_bits_iterator
+    class KICOMMON_API set_bits_iterator
     {
     public:
         using iterator_category = std::forward_iterator_tag;
@@ -255,7 +255,7 @@ public:
     };
 
     // Custom reverse iterator to iterate over set bits in reverse order
-    class set_bits_reverse_iterator
+    class KICOMMON_API set_bits_reverse_iterator
     {
     public:
         using iterator_category = std::bidirectional_iterator_tag;

include/lset.h

@@ -292,7 +292,7 @@ public:
 
 #ifndef SWIG
     // Custom iterator to iterate over all set bits
-    class all_set_layers_iterator : public BASE_SET::set_bits_iterator
+    class KICOMMON_API all_set_layers_iterator : public BASE_SET::set_bits_iterator
     {
     public:
         all_set_layers_iterator( const BASE_SET& set, size_t index ) :
@@ -313,7 +313,7 @@ public:
     all_set_layers_iterator end() const { return all_set_layers_iterator( *this, size() ); }
 
     // Custom iterators for Copper and Non-Copper layers
-    class copper_layers_iterator : public BASE_SET::set_bits_iterator
+    class KICOMMON_API copper_layers_iterator : public BASE_SET::set_bits_iterator
     {
     public:
         copper_layers_iterator( const BASE_SET& set, size_t index );
@@ -325,7 +325,7 @@ public:
         void next_copper_layer();
     };
 
-    class non_copper_layers_iterator : public BASE_SET::set_bits_iterator
+    class KICOMMON_API non_copper_layers_iterator : public BASE_SET::set_bits_iterator
     {
     public:
         non_copper_layers_iterator( const BASE_SET& set, size_t index );