Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Iox #59 memory abstraction modularization roudi fixes #60

Conversation

marthtz
Copy link
Contributor

@marthtz marthtz commented Mar 6, 2020

No description provided.

marthtz added 2 commits March 6, 2020 12:08
Signed-off-by: Hintz Martin (CC-AD/ESW1) <martin.hintz@de.bosch.com>
Signed-off-by: Hintz Martin (CC-AD/ESW1) <martin.hintz@de.bosch.com>
@marthtz marthtz force-pushed the iox-#59-memory-abstraction-modularization-roudi-fixes branch from d764b7b to 6918394 Compare March 6, 2020 11:09
@marthtz
Copy link
Contributor Author

marthtz commented Mar 6, 2020

Do we intend to supply a default "roudi_config.toml"?

README.md Outdated
@@ -89,7 +89,7 @@ Although we strive to be fully POSIX-compliant, we recommend using Ubuntu 18.04

You will need to install the following packages:

sudo apt install cmake libacl1-dev libncurses5-dev pkg-config
sudo apt-get install cmake libacl1-dev libncurses5-dev pkg-config
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I saw a PR which removed the "-get" and it seems it's the recommended way since some time
see https://itsfoss.com/apt-vs-apt-get-difference/

Copy link
Contributor Author

@marthtz marthtz Mar 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't aware of that. Thought it's a typo! ;)
Fixed.

INCLUDE_DIRECTORY include/
)
if(TOML_CONFIG)
setup_install_directories_and_export_package(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure this can be called twice, have to check

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was working fine, when I tested it.

{
}

Publisher::~Publisher() noexcept
{
m_sender.destroy();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are we sure about removing this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not at all, we just introduced it

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

/// @brief copy conversion constructor to convert an expected which contains value and
/// error type to an expected which contains only an error
template <typename ValueType>
expected(const expected<ValueType, ErrorType>& rhs) noexcept;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elfenpiff is this correct or an merge error?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is special handling for Win/MSVC. Added code and #if WIN32 to fix it.

@@ -124,7 +125,7 @@ class optional
/// @param[in] value value to assign to the underlying optional value
/// @return reference to the current optional
template <typename U = T>
typename ::std::enable_if<!::std::is_same<U, optional<T>&>::value, optional>::type& operator=(U&& value) noexcept;
typename std::enable_if<!std::is_same<U, optional<T>&>::value, optional>::type& operator=(U&& value) noexcept;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elfenpiff is this correct or a merge error?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In all other code references it's std:: and not ::std::.

@@ -109,7 +109,7 @@ inline optional<T>::~optional() noexcept

template <typename T>
template <typename U>
inline typename ::std::enable_if<!::std::is_same<U, optional<T>&>::value, optional<T>>::type& optional<T>::
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elfenpiff is this correct or a merge error?

#include "test.hpp"

#include <cstdint>
#include <cstring>
#include <fcntl.h> /* For O_* constants */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think all the changes in this file are due to merge errors

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

@mossmaurice
Copy link
Contributor

Do we intend to supply a default "roudi_config.toml"?

Yes, we do.

@mossmaurice mossmaurice added the enhancement New feature label Mar 6, 2020
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
set(iceoryx_posh_VERSION 0.16.0.1)
set(iceoryx_posh_VERSION 0.16.0.3)
Copy link
Contributor

@mossmaurice mossmaurice Mar 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is already a 0.16.1 release and the version wasn‘t updated properly. Please set to 0.16.1 @dkroenke Is that ok?

@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
set(iceoryx_utils_VERSION 0.16.0.1)
set(iceoryx_utils_VERSION 0.16.0.3)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update version to 0.16.1

@@ -327,58 +327,6 @@ inline expected<ErrorType>::expected(error<ErrorType>&& errorValue) noexcept
{
}

template <typename ErrorType>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed by error?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is special handling for Win/MSVC. Added code and #if WIN32 to fix it.

@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
set(iceoryx_introspection_VERSION 0.16.0.1)
set(iceoryx_introspection_VERSION 0.16.0.3)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update the version to 0.16.1

marthtz added 2 commits March 6, 2020 14:45
Signed-off-by: Hintz Martin (CC-AD/ESW1) <martin.hintz@de.bosch.com>
Signed-off-by: Hintz Martin (CC-AD/ESW1) <martin.hintz@de.bosch.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants