Merge master to successfully build CI #1310
Conversation
* The most recent release of various sphinx related packages need Sphinx 5 or up, but our old sphinx-book-theme 0.3.3 requires Sphinx 4 For a proper solution see #1303
Adds the missing core functions from ecal_core.h (GetVersion, IsInitialized, SetUnitName) to ecal_clang and the python wrapper.
…not yet stable. (#1307)
KerstinKeller
merged commit 0deef0d
into
unprotected-internal-reader-writer-memfiles
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -58,7 +58,7 @@ bool EcalPlay::LoadMeasurement(const std::string& path) | |||
| { | |||
| EcalPlayLogger::Instance()->info("Loading measurement..."); | |||
|
|
|||
| std::shared_ptr<eCAL::measurement::base::Reader> measurement(std::make_shared<eCAL::measurement::hdf5::Reader>()); | |||
| std::shared_ptr<eCAL::experimental::measurement::base::Reader> measurement(std::make_shared<eCAL::experimental::measurement::hdf5::Reader>()); | |||
There was a problem hiding this comment.
warning: variable 'measurement' of type 'std::shared_ptreCAL::experimental::measurement::base::Reader' can be declared 'const' [misc-const-correctness]
| std::shared_ptr<eCAL::experimental::measurement::base::Reader> measurement(std::make_shared<eCAL::experimental::measurement::hdf5::Reader>()); | |
| std::shared_ptr<eCAL::experimental::measurement::base::Reader> const measurement(std::make_shared<eCAL::experimental::measurement::hdf5::Reader>()); |
| @@ -134,7 +134,7 @@ namespace eCAL | |||
| bool operator!=(const IChannel& rhs) const { return !(operator==(rhs)); } | |||
|
|
|||
| //virtual Entry<T> operator[](unsigned long long timestamp); | |||
| virtual Frame<T> operator[](const base::EntryInfo& entry) | |||
| virtual Frame<T> operator[](const experimental::measurement::base::EntryInfo& entry) | |||
| { | |||
| auto binary_entry = binary_channel[entry]; | |||
| eCAL::message::Deserialize(binary_entry.message, message); | |||
There was a problem hiding this comment.
warning: 'message' is not a class, namespace, or enumeration [clang-diagnostic-error]
eCAL::message::Deserialize(binary_entry.message, message);
^Additional context
contrib/measurement/base/include/ecal/measurement/imeasurement.h:213: 'message' declared here
mutable T message;
^| @@ -72,7 +72,7 @@ namespace eCAL | |||
| class OChannel | |||
| { | |||
| public: | |||
| OChannel(std::shared_ptr<base::Writer> meas_, std::string name_) | |||
| OChannel(std::shared_ptr<experimental::measurement::base::Writer> meas_, std::string name_) | |||
There was a problem hiding this comment.
warning: the parameter 'name_' is copied for each invocation but only used as a const reference; consider making it a const reference [performance-unnecessary-value-param]
| OChannel(std::shared_ptr<experimental::measurement::base::Writer> meas_, std::string name_) | |
| OChannel(std::shared_ptr<experimental::measurement::base::Writer> meas_, const std::string& name_) |
| /** | ||
| * @brief Destructor | ||
| **/ | ||
| virtual ~Reader(); |
There was a problem hiding this comment.
warning: prefer using 'override' or (rarely) 'final' instead of 'virtual' [cppcoreguidelines-explicit-virtual-functions]
| virtual ~Reader(); | |
| ~Reader() override; |
| /** | ||
| * @brief Destructor | ||
| **/ | ||
| virtual ~Writer(); |
There was a problem hiding this comment.
warning: prefer using 'override' or (rarely) 'final' instead of 'virtual' [cppcoreguidelines-explicit-virtual-functions]
| virtual ~Writer(); | |
| ~Writer() override; |
| @@ -279,7 +279,7 @@ static PyObject* Meas_GetEntriesInfo(Meas *self, PyObject *args) | |||
| if (!PyArg_ParseTuple(args, "s", &channel_name)) | |||
| return nullptr; | |||
|
|
|||
| eCAL::measurement::base::EntryInfoSet entries; | |||
| eCAL::experimental::measurement::base::EntryInfoSet entries; | |||
There was a problem hiding this comment.
warning: variable 'entries' is not initialized [cppcoreguidelines-init-variables]
| eCAL::experimental::measurement::base::EntryInfoSet entries; | |
| eCAL::experimental::measurement::base::EntryInfoSet entries = 0; |
| @@ -327,7 +327,7 @@ | |||
| if (!PyArg_ParseTuple(args, "sLL", &channel_name, &begin, &end)) | |||
| return nullptr; | |||
|
|
|||
| eCAL::measurement::base::EntryInfoSet entries; | |||
| eCAL::experimental::measurement::base::EntryInfoSet entries; | |||
There was a problem hiding this comment.
warning: variable 'entries' is not initialized [cppcoreguidelines-init-variables]
| eCAL::experimental::measurement::base::EntryInfoSet entries; | |
| eCAL::experimental::measurement::base::EntryInfoSet entries = 0; |
No description provided.