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

modified to be able to develop mros2 with mbed studio. #16

Open
wants to merge 3 commits into
base: mros2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
**NOTE:** This branch has been modified to allow mros2 development in mbed studio.



**NOTE:** We maintain this repository as the component of [mros2](https://github.com/mROS-base/mros2), by adding some modifications (e.g., [PR#11](https://github.com/mROS-base/embeddedRTPS/pull/11)). So the base branch of this repository has been set to `mros2`.
The branch and commit of [the original (forked) repository](https://github.com/embedded-software-laboratory/embeddedRTPS) are [mros2_master](https://github.com/mROS-base/embeddedRTPS/tree/mros2_master) and [1410a87](https://github.com/mROS-base/embeddedRTPS/commit/1410a8776660244249a84031ffa78c9bdaa45e19), respectively.

Expand Down
1 change: 1 addition & 0 deletions include/rtps/common/Locator.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ struct FullLengthLocator {
} else {
ucdr_serialize_array_uint8_t(&buffer, reinterpret_cast<uint8_t *>(this),
sizeof(FullLengthLocator));
return true;
}
}

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/Micro-CDR/include/ucdr/microcdr.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ extern "C" {

#include <ucdr/common.h>
#include <ucdr/types/basic.h>
#include <ucdr/types/string.h>
#include <ucdr/types/ucdr_string.h>
#include <ucdr/types/array.h>
#include <ucdr/types/sequence.h>

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/Micro-CDR/src/c/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include <ucdr/common.h>

#include <string.h>
#include <ucdr_string.h>

#if __BIG_ENDIAN__
const ucdrEndianness UCDR_MACHINE_ENDIANNESS = UCDR_BIG_ENDIANNESS;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <ucdr/types/string.h>
#include <ucdr/types/ucdr_string.h>
#include <ucdr/types/sequence.h>

#include <string.h>
Expand Down