Upgrade CSP to C++20; build websocket against C++17; rename .hi files

Signed-off-by: Adam Glustein <[email protected]>
Point72 · May 9, 2024 · e12c3bf · e12c3bf
1 parent e1e1f82
commit e12c3bf
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@
 #########################
 cmake_minimum_required(VERSION 3.20.0)
 project(csp VERSION "0.0.3")
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 ###################################################################################################################################################
 # CMake Dependencies #
@@ -153,9 +153,6 @@ endif()
 ###################################################################################################################################################
 # Flags #
 #########
-# Compiler version flags
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-
 # Optimization Flags
 if(WIN32)
     if(CMAKE_BUILD_TYPE_LOWER STREQUAL debug)

diff --git a/cpp/csp/adapters/CMakeLists.txt b/cpp/csp/adapters/CMakeLists.txt
@@ -8,7 +8,10 @@ if(CSP_BUILD_PARQUET_ADAPTER)
 endif()
 
 if(CSP_BUILD_WS_CLIENT_ADAPTER)
-    add_subdirectory(websocket)
+    # Need to build websocket adapter under cpp17 standard due to websocketpp incompatibility issues
+    set(CMAKE_CXX_STANDARD 17)
+        add_subdirectory(websocket)
+    set(CMAKE_CXX_STANDARD 20)
 endif()
 
 add_subdirectory(utils)
diff --git a/cpp/csp/python/CMakeLists.txt b/cpp/csp/python/CMakeLists.txt
@@ -4,16 +4,16 @@ set(CSPTYPESIMPL_PUBLIC_HEADERS
         PyCspEnum.h
         PyCspType.h
         PyStruct.h
-        PyStructList.h)
+        PyStructList.h
+        PyStructList_impl.h)
 
 add_library(csptypesimpl
             csptypesimpl.cpp
             CspTypeFactory.cpp
             PyCspEnum.cpp
             PyCspType.cpp
             PyStruct.cpp
-            PyStructToJson.cpp
-            PyStructList.hi)
+            PyStructToJson.cpp)
 set_target_properties(csptypesimpl PROPERTIES PUBLIC_HEADER "${CSPTYPESIMPL_PUBLIC_HEADERS}")
 target_compile_definitions(csptypesimpl PUBLIC RAPIDJSON_HAS_STDSTRING=1)
 target_link_libraries(csptypesimpl csp_core csp_types)
@@ -42,7 +42,8 @@ set(CSPIMPL_PUBLIC_HEADERS
         PyOutputProxy.h
         PyConstants.h
         PyStructToJson.h
-        PyStructList.h)
+        PyStructList.h
+        PyStructList_impl.h)
 
 add_library(cspimpl SHARED
         cspimpl.cpp
@@ -73,7 +74,6 @@ add_library(cspimpl SHARED
         PyManagedSimInputAdapter.cpp
         PyTimerAdapter.cpp
         PyConstants.cpp
-        PyStructList.hi
         ${CSPIMPL_PUBLIC_HEADERS})
 
 set_target_properties(cspimpl PROPERTIES PUBLIC_HEADER "${CSPIMPL_PUBLIC_HEADERS}")

diff --git a/cpp/csp/python/PyStruct.cpp b/cpp/csp/python/PyStruct.cpp
@@ -3,7 +3,7 @@
 #include <csp/python/InitHelper.h>
 #include <csp/python/PyObjectPtr.h>
 #include <csp/python/PyStruct.h>
-#include <csp/python/PyStructList.hi>
+#include <csp/python/PyStructList_impl.h>
 #include <csp/python/PyStructToJson.h>
 #include <unordered_set>
 #include <type_traits>

diff --git a/cpp/csp/python/PyStructList.h b/cpp/csp/python/PyStructList.h
@@ -14,7 +14,7 @@ struct PyStructList : public PyObject
 {
     using ElemT = typename CspType::Type::toCArrayElemType<StorageT>::type;
 
-    PyStructList<StorageT>( PyStruct * p, std::vector<StorageT> & v, const CspType & type ) : pystruct( p ), vector( v ), field_type( type )
+    PyStructList( PyStruct * p, std::vector<StorageT> & v, const CspType & type ) : pystruct( p ), vector( v ), field_type( type )
     {
         Py_INCREF( pystruct );
     }

diff --git a/cpp/csp/python/PyStructList.hi → cpp/csp/python/PyStructList_impl.h b/cpp/csp/python/PyStructList.hi → cpp/csp/python/PyStructList_impl.h
@@ -435,7 +435,7 @@ PyStructList_dealloc( PyStructList<StorageT> * self )
 }
 
 template<typename StorageT> PyTypeObject PyStructList<StorageT>::PyType = {
-    PyVarObject_HEAD_INIT( NULL, 0 )
+    .ob_base = PyVarObject_HEAD_INIT( NULL, 0 )
     .tp_name = "_cspimpl.PyStructList",
     .tp_basicsize = sizeof( PyStructList<StorageT> ),
     .tp_itemsize = 0,

diff --git a/cpp/csp/python/adapters/CMakeLists.txt b/cpp/csp/python/adapters/CMakeLists.txt
@@ -35,7 +35,9 @@ if(CSP_BUILD_PARQUET_ADAPTER)
 endif()
 
 if(CSP_BUILD_WS_CLIENT_ADAPTER)
-	add_library(websocketadapterimpl SHARED websocketadapterimpl.cpp)
-	target_link_libraries(websocketadapterimpl csp_core csp_engine cspimpl csp_websocket_client_adapter)
-	install(TARGETS websocketadapterimpl RUNTIME DESTINATION bin/ LIBRARY DESTINATION lib/)
+    set(CMAKE_CXX_STANDARD 17)
+        add_library(websocketadapterimpl SHARED websocketadapterimpl.cpp)
+        target_link_libraries(websocketadapterimpl csp_core csp_engine cspimpl csp_websocket_client_adapter)
+        install(TARGETS websocketadapterimpl RUNTIME DESTINATION bin/ LIBRARY DESTINATION lib/)
+    set(CMAKE_CXX_STANDARD 20)
 endif()