Skip to content

Commit 512a6fd

Browse files
committed
Use cmake GenerateExportHeader to hopefully fix Windows visibility as well
Signed-off-by: Adam Glustein <adam.glustein@point72.com>
1 parent 571b9d5 commit 512a6fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+331
-120
lines changed

cpp/csp/adapters/kafka/KafkaAdapterManager.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include <csp/core/Enum.h>
55
#include <csp/core/Hash.h>
6+
#include <csp/core/Platform.h>
67
#include <csp/engine/AdapterManager.h>
78
#include <csp/engine/Dictionary.h>
89
#include <csp/engine/PushInputAdapter.h>
@@ -11,6 +12,7 @@
1112
#include <unordered_map>
1213
#include <vector>
1314

15+
1416
namespace RdKafka
1517
{
1618

@@ -47,7 +49,7 @@ struct KafkaStatusMessageTypeTraits
4749
using KafkaStatusMessageType = csp::Enum<KafkaStatusMessageTypeTraits>;
4850

4951
//Top level AdapterManager object for all kafka adapters in the engine
50-
class CSP_PUBLIC KafkaAdapterManager final : public csp::AdapterManager
52+
class CSPKAFKAADAPTERIMPL_EXPORT KafkaAdapterManager final : public csp::AdapterManager
5153
{
5254
public:
5355
KafkaAdapterManager( csp::Engine * engine, const Dictionary & properties );

cpp/csp/adapters/parquet/DialectGenericListReaderInterface.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
#define _IN_CSP_ADAPTERS_PARQUET_DialectGenericListReaderInterface_H
33

44
#include <memory>
5+
#include <csp/core/Platform.h>
56
#include <csp/engine/DialectGenericType.h>
67
#include <csp/adapters/parquet/ParquetReaderColumnAdapter.h>
78
#include <arrow/array/builder_base.h>
89

910
namespace csp::adapters::parquet
1011
{
1112

12-
class DialectGenericListReaderInterface
13+
class CSPPARQUETADAPTERIMPL_EXPORT DialectGenericListReaderInterface
1314
{
1415
public:
1516
using Ptr = std::shared_ptr<DialectGenericListReaderInterface>;
@@ -25,7 +26,7 @@ class DialectGenericListReaderInterface
2526
};
2627

2728
template< typename T >
28-
class CSP_PUBLIC TypedDialectGenericListReaderInterface : public DialectGenericListReaderInterface
29+
class CSPPARQUETADAPTERIMPL_EXPORT TypedDialectGenericListReaderInterface : public DialectGenericListReaderInterface
2930
{
3031
public:
3132
using Ptr = std::shared_ptr<TypedDialectGenericListReaderInterface<T>>;

cpp/csp/adapters/parquet/ParquetInputAdapterManager.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <csp/adapters/parquet/ParquetReader.h>
55
#include <csp/adapters/utils/StructAdapterInfo.h>
66
#include <csp/core/Generator.h>
7+
#include <csp/core/Platform.h>
78
#include <csp/engine/AdapterManager.h>
89
#include <csp/engine/Dictionary.h>
910
#include <unordered_map>
@@ -18,7 +19,7 @@ namespace csp::adapters::parquet
1819

1920

2021
//Top level AdapterManager object for all parquet adapters in the engine
21-
class CSP_PUBLIC ParquetInputAdapterManager final : public csp::AdapterManager
22+
class CSPPARQUETADAPTERIMPL_EXPORT ParquetInputAdapterManager final : public csp::AdapterManager
2223
{
2324
public:
2425
using GeneratorPtr = csp::Generator<std::string, csp::DateTime, csp::DateTime>::Ptr;

cpp/csp/adapters/parquet/ParquetOutputAdapterManager.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <csp/adapters/parquet/ParquetReader.h>
55
#include <csp/adapters/utils/StructAdapterInfo.h>
66
#include <csp/core/Generator.h>
7+
#include <csp/core/Platform.h>
78
#include <csp/engine/AdapterManager.h>
89
#include <csp/engine/Dictionary.h>
910
#include <set>
@@ -21,7 +22,7 @@ class ParquetOutputFilenameAdapter;
2122
class ParquetDictBasketOutputWriter;
2223

2324
//Top level AdapterManager object for all parquet adapters in the engine
24-
class CSP_PUBLIC ParquetOutputAdapterManager final : public csp::AdapterManager
25+
class CSPPARQUETADAPTERIMPL_EXPORT ParquetOutputAdapterManager final : public csp::AdapterManager
2526
{
2627
public:
2728
using FileVisitorCallback = std::function<void(const std::string &)>;

cpp/csp/adapters/websocket/ClientAdapterManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ struct WebsocketClientStatusTypeTraits
4040

4141
using ClientStatusType = Enum<WebsocketClientStatusTypeTraits>;
4242

43-
class CSP_PUBLIC ClientAdapterManager final : public AdapterManager
43+
class CSPWEBSOCKETADAPTERIMPL_EXPORT ClientAdapterManager final : public AdapterManager
4444
{
4545
public:
4646
ClientAdapterManager(

cpp/csp/core/BasicAllocator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace csp
1515
{
1616

1717
// Extremely basic non-thread safe fixed-size allocator
18-
class CSP_PUBLIC BasicAllocator
18+
class CSPIMPL_EXPORT BasicAllocator
1919
{
2020
public:
2121
//elemsize is size of a single alloc, blockSize is number of elements to

cpp/csp/core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ install(TARGETS csp_core
3333
RUNTIME DESTINATION ${CSP_RUNTIME_INSTALL_SUBDIR}
3434
LIBRARY DESTINATION lib/
3535
)
36-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cpp/csp/core/Config.h DESTINATION include/csp/core)
36+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cpp/csp/core/Config.h DESTINATION include/csp/core)

cpp/csp/core/DynamicBitSet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace csp
99
{
1010

1111
template<typename NodeT = uint64_t, typename IndexT = int32_t>
12-
class CSP_PUBLIC DynamicBitSet
12+
class CSPIMPL_EXPORT DynamicBitSet
1313
{
1414

1515
public:

cpp/csp/core/Enum.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ bool UnknownOnInvalidValue(long) { return false; }
7373

7474
START_PACKED
7575
template<typename EnumTraits>
76-
struct CSP_PUBLIC Enum : public EnumTraits
76+
struct CSPTYPESIMPL_EXPORT Enum : public EnumTraits
7777
{
7878
using EnumV = typename EnumTraits::_enum;
7979
using Mapping = std::vector<std::string>;

cpp/csp/core/EnumBitSet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace csp
1414
//Utility class to hold enums as a bitmask ( where enum values are incremental from 0 )
1515
//enum must have a NUM_TYPES entry for number of entries
1616
template< typename EnumT >
17-
class CSP_PUBLIC EnumBitSet
17+
class CSPTYPESIMPL_EXPORT EnumBitSet
1818
{
1919
using value_type = uint64_t;
2020

0 commit comments

Comments
 (0)