Skip to content

Commit 3a5d1ad

Browse files
philippeVerneyphilippeVerney
committed
Replace boost::optional with std::optional and boost::any with std::variant
Migrated all uses of boost::optional to std::optional and updated related code to use .value() and .has_value() instead of .get() and .is_initialized(). Refactored union types to use std::variant instead of boost::any, and updated Avro codec_traits for std::optional. Also updated usages in example, protocol handlers, and data array handlers to match new APIs.
1 parent 5f18443 commit 3a5d1ad

11 files changed

Lines changed: 231 additions & 616 deletions

File tree

‎.github/workflows/github-actions.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ jobs:
331331
make &&
332332
make install &&
333333
cd ${{ github.workspace }}/.. &&
334-
wget --no-verbose https://downloads.apache.org/avro/avro-1.11.3/cpp/avro-cpp-1.11.3.tar.gz &&
334+
wget --no-verbose https://archive.apache.org/dist/avro/avro-1.11.3/cpp/avro-cpp-1.11.3.tar.gz &&
335335
tar xf avro-cpp-1.11.3.tar.gz &&
336336
sed -i '' 's/cmake_minimum_required (VERSION 3.1)/cmake_minimum_required (VERSION 3.5)/' avro-cpp-1.11.3/CMakeLists.txt &&
337337
sed -i '' 's/if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.0)/if (APPLE)/' avro-cpp-1.11.3/CMakeLists.txt &&

‎cmake/pyproject.toml.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ keywords = [
4343
]
4444
requires-python = ">=3.8"
4545
dependencies = [
46-
'fesapi==2.12.1',
46+
'fesapi==2.13.0',
4747
]
4848

4949
[project.urls]

‎cmake/swigEtp1_2Include.i.in‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -377,22 +377,22 @@ namespace Energistics {
377377
std::string get_string();
378378
void set_string(const std::string& v);
379379

380-
Energistics::Etp::v12::Datatypes::ArrayOfBoolean get_ArrayOfBoolean();
380+
Energistics::Etp::v12::Datatypes::ArrayOfBoolean const& get_ArrayOfBoolean() const;
381381
void set_ArrayOfBoolean(const Energistics::Etp::v12::Datatypes::ArrayOfBoolean& v);
382382

383-
Energistics::Etp::v12::Datatypes::ArrayOfInt get_ArrayOfInt();
383+
Energistics::Etp::v12::Datatypes::ArrayOfInt const& get_ArrayOfInt() const;
384384
void set_ArrayOfInt(const Energistics::Etp::v12::Datatypes::ArrayOfInt& v);
385385

386-
Energistics::Etp::v12::Datatypes::ArrayOfLong get_ArrayOfLong();
386+
Energistics::Etp::v12::Datatypes::ArrayOfLong const& get_ArrayOfLong() const;
387387
void set_ArrayOfLong(const Energistics::Etp::v12::Datatypes::ArrayOfLong& v);
388388

389-
Energistics::Etp::v12::Datatypes::ArrayOfFloat get_ArrayOfFloat();
389+
Energistics::Etp::v12::Datatypes::ArrayOfFloat const& get_ArrayOfFloat() const;
390390
void set_ArrayOfFloat(const Energistics::Etp::v12::Datatypes::ArrayOfFloat& v);
391391

392-
Energistics::Etp::v12::Datatypes::ArrayOfDouble get_ArrayOfDouble();
392+
Energistics::Etp::v12::Datatypes::ArrayOfDouble const& get_ArrayOfDouble() const;
393393
void set_ArrayOfDouble(const Energistics::Etp::v12::Datatypes::ArrayOfDouble& v);
394394

395-
Energistics::Etp::v12::Datatypes::ArrayOfString get_ArrayOfString();
395+
Energistics::Etp::v12::Datatypes::ArrayOfString const& get_ArrayOfString() const;
396396
void set_ArrayOfString(const Energistics::Etp::v12::Datatypes::ArrayOfString& v);
397397

398398
std::string get_bytes();
@@ -412,25 +412,25 @@ namespace Energistics {
412412
public:
413413
size_t idx() const;
414414

415-
Energistics::Etp::v12::Datatypes::ArrayOfBoolean get_ArrayOfBoolean();
415+
Energistics::Etp::v12::Datatypes::ArrayOfBoolean const& get_ArrayOfBoolean() const;
416416
void set_ArrayOfBoolean(const Energistics::Etp::v12::Datatypes::ArrayOfBoolean& v);
417417

418-
Energistics::Etp::v12::Datatypes::ArrayOfInt get_ArrayOfInt();
418+
Energistics::Etp::v12::Datatypes::ArrayOfInt const& get_ArrayOfInt() const;
419419
void set_ArrayOfInt(const Energistics::Etp::v12::Datatypes::ArrayOfInt& v);
420420

421-
Energistics::Etp::v12::Datatypes::ArrayOfLong get_ArrayOfLong();
421+
Energistics::Etp::v12::Datatypes::ArrayOfLong const& get_ArrayOfLong() const;
422422
void set_ArrayOfLong(const Energistics::Etp::v12::Datatypes::ArrayOfLong& v);
423423

424-
Energistics::Etp::v12::Datatypes::ArrayOfFloat get_ArrayOfFloat();
424+
Energistics::Etp::v12::Datatypes::ArrayOfFloat const& get_ArrayOfFloat() const;
425425
void set_ArrayOfFloat(const Energistics::Etp::v12::Datatypes::ArrayOfFloat& v);
426426

427-
Energistics::Etp::v12::Datatypes::ArrayOfDouble get_ArrayOfDouble();
427+
Energistics::Etp::v12::Datatypes::ArrayOfDouble const& get_ArrayOfDouble() const;
428428
void set_ArrayOfDouble(const Energistics::Etp::v12::Datatypes::ArrayOfDouble& v);
429429

430-
Energistics::Etp::v12::Datatypes::ArrayOfString get_ArrayOfString();
430+
Energistics::Etp::v12::Datatypes::ArrayOfString const& get_ArrayOfString() const;
431431
void set_ArrayOfString(const Energistics::Etp::v12::Datatypes::ArrayOfString& v);
432432

433-
std::string get_bytes();
433+
std::string const& get_bytes() const;
434434
void set_bytes(const std::string& v);
435435
};
436436

‎example/withFesapi/etpClient.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ void askUser(std::shared_ptr<ETP_NS::AbstractSession> session, COMMON_NS::DataOb
196196
const auto resources = session->getResources(mb.context, mb.scope);
197197
for (auto& resource : resources) {
198198
std::cout << resource.uri << std::endl;
199-
if (resource.has_sourceCount()) std::cout << "Source count: " << resource.sourceCount.get() << std::endl;
200-
if (resource.has_targetCount()) std::cout << "Target count: " << resource.targetCount.get() << std::endl;
199+
if (resource.has_sourceCount()) std::cout << "Source count: " << resource.sourceCount.value() << std::endl;
200+
if (resource.has_targetCount()) std::cout << "Target count: " << resource.targetCount.value() << std::endl;
201201
}
202202
continue;
203203
}
@@ -680,7 +680,7 @@ void askUser(std::shared_ptr<ETP_NS::AbstractSession> session, COMMON_NS::DataOb
680680
Energistics::Etp::v12::Datatypes::AnyArray data;
681681
Energistics::Etp::v12::Datatypes::ArrayOfInt arrayOfInt;
682682
arrayOfInt.values = { 0,1,2,3,4,5,6,7,8,9 };
683-
data.item.set_ArrayOfInt(arrayOfInt);
683+
data.item.set_ArrayOfInt(std::move(arrayOfInt));
684684
pda.dataArrays["0"].array.data = data;
685685
std::cout << "Start sending the array" << std::endl;
686686

‎python/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if (WITH_FESAPI)
5858
set (FESAPI_LIBRARY_RELEASE_WLE ",'${FESAPI_LIBRARY_RELEASE_WLE}'")
5959
endif ()
6060
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
61-
set (EXTRA_COMPILE_ARGS "extra-compile-args=['/DSWIG_TYPE_TABLE=FESTAPI', '/utf-8']")
61+
set (EXTRA_COMPILE_ARGS "extra-compile-args=['/DSWIG_TYPE_TABLE=FESTAPI', '/std:c++17', '/utf-8']")
6262
else ()
6363
set (EXTRA_COMPILE_ARGS "extra-compile-args=['-DSWIG_TYPE_TABLE=FESTAPI', '-std=c++17']")
6464
endif()

0 commit comments

Comments
 (0)