Skip to content

Commit 6af54bc

Browse files
emiliocuestafemiliocuestaf
committed
Fix conflicts
Signed-off-by: Emilio Cuesta <emiliocuesta@eprosima.com>
1 parent a7b2e9b commit 6af54bc

2 files changed

Lines changed: 0 additions & 174 deletions

File tree

‎fastdds_python/test/types/test_complete.i‎

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -212,35 +212,6 @@ namespace swig {
212212

213213

214214

215-
<<<<<<< HEAD
216-
=======
217-
%ignore StructType::fixed_string_field(eprosima::fastcdr::fixed_string<16>&&);
218-
219-
220-
// Overloaded getter methods shadow each other and are equivalent in python
221-
// Const accesors produced constant enums instead of arrays/dictionaries when used
222-
// We ignore them to prevent this
223-
%ignore StructType::fixed_string_field();
224-
%rename("%s") StructType::fixed_string_field() const;
225-
226-
%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>;
227-
%extend StructType
228-
{
229-
void fixed_string_field(const std::string& value)
230-
{
231-
eprosima::fastcdr::fixed_string<16> tmp(value);
232-
$self->fixed_string_field(tmp);
233-
}
234-
235-
std::string fixed_string_field_str() const
236-
{
237-
return std::string($self->fixed_string_field(), strnlen($self->fixed_string_field(), 16));
238-
}
239-
}
240-
241-
242-
243-
>>>>>>> 57a5541 (Set CMAKE_SHARED_LIBRARY_SUFFIX to always create .so files (#207))
244215
%ignore StructType::enum_field(Color&&);
245216

246217

@@ -439,35 +410,6 @@ namespace swig {
439410

440411

441412

442-
<<<<<<< HEAD
443-
=======
444-
%ignore CompleteTestType::fixed_string_field(eprosima::fastcdr::fixed_string<16>&&);
445-
446-
447-
// Overloaded getter methods shadow each other and are equivalent in python
448-
// Const accesors produced constant enums instead of arrays/dictionaries when used
449-
// We ignore them to prevent this
450-
%ignore CompleteTestType::fixed_string_field();
451-
%rename("%s") CompleteTestType::fixed_string_field() const;
452-
453-
%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>;
454-
%extend CompleteTestType
455-
{
456-
void fixed_string_field(const std::string& value)
457-
{
458-
eprosima::fastcdr::fixed_string<16> tmp(value);
459-
$self->fixed_string_field(tmp);
460-
}
461-
462-
std::string fixed_string_field_str() const
463-
{
464-
return std::string($self->fixed_string_field(), strnlen($self->fixed_string_field(), 16));
465-
}
466-
}
467-
468-
469-
470-
>>>>>>> 57a5541 (Set CMAKE_SHARED_LIBRARY_SUFFIX to always create .so files (#207))
471413
%ignore CompleteTestType::enum_field(Color&&);
472414

473415

@@ -1766,35 +1708,6 @@ namespace swig {
17661708

17671709

17681710

1769-
<<<<<<< HEAD
1770-
=======
1771-
%ignore KeyedCompleteTestType::fixed_string_field(eprosima::fastcdr::fixed_string<16>&&);
1772-
1773-
1774-
// Overloaded getter methods shadow each other and are equivalent in python
1775-
// Const accesors produced constant enums instead of arrays/dictionaries when used
1776-
// We ignore them to prevent this
1777-
%ignore KeyedCompleteTestType::fixed_string_field();
1778-
%rename("%s") KeyedCompleteTestType::fixed_string_field() const;
1779-
1780-
%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>;
1781-
%extend KeyedCompleteTestType
1782-
{
1783-
void fixed_string_field(const std::string& value)
1784-
{
1785-
eprosima::fastcdr::fixed_string<16> tmp(value);
1786-
$self->fixed_string_field(tmp);
1787-
}
1788-
1789-
std::string fixed_string_field_str() const
1790-
{
1791-
return std::string($self->fixed_string_field(), strnlen($self->fixed_string_field(), 16));
1792-
}
1793-
}
1794-
1795-
1796-
1797-
>>>>>>> 57a5541 (Set CMAKE_SHARED_LIBRARY_SUFFIX to always create .so files (#207))
17981711
%ignore KeyedCompleteTestType::enum_field(Color&&);
17991712

18001713

‎fastdds_python/test/types/test_modules.i‎

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -211,35 +211,6 @@ namespace swig {
211211

212212

213213

214-
<<<<<<< HEAD
215-
=======
216-
%ignore eprosima::test::StructType::fixed_string_field(eprosima::fastcdr::fixed_string<16>&&);
217-
218-
219-
// Overloaded getter methods shadow each other and are equivalent in python
220-
// Const accesors produced constant enums instead of arrays/dictionaries when used
221-
// We ignore them to prevent this
222-
%ignore eprosima::test::StructType::fixed_string_field();
223-
%rename("%s") eprosima::test::StructType::fixed_string_field() const;
224-
225-
%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>;
226-
%extend eprosima::test::StructType
227-
{
228-
void fixed_string_field(const std::string& value)
229-
{
230-
eprosima::fastcdr::fixed_string<16> tmp(value);
231-
$self->fixed_string_field(tmp);
232-
}
233-
234-
std::string fixed_string_field_str() const
235-
{
236-
return std::string($self->fixed_string_field(), strnlen($self->fixed_string_field(), 16));
237-
}
238-
}
239-
240-
241-
242-
>>>>>>> 57a5541 (Set CMAKE_SHARED_LIBRARY_SUFFIX to always create .so files (#207))
243214
%ignore eprosima::test::StructType::enum_field(eprosima::test::Color&&);
244215

245216

@@ -427,35 +398,6 @@ namespace swig {
427398

428399

429400

430-
<<<<<<< HEAD
431-
=======
432-
%ignore eprosima::test::CompleteTestType::fixed_string_field(eprosima::fastcdr::fixed_string<16>&&);
433-
434-
435-
// Overloaded getter methods shadow each other and are equivalent in python
436-
// Const accesors produced constant enums instead of arrays/dictionaries when used
437-
// We ignore them to prevent this
438-
%ignore eprosima::test::CompleteTestType::fixed_string_field();
439-
%rename("%s") eprosima::test::CompleteTestType::fixed_string_field() const;
440-
441-
%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>;
442-
%extend eprosima::test::CompleteTestType
443-
{
444-
void fixed_string_field(const std::string& value)
445-
{
446-
eprosima::fastcdr::fixed_string<16> tmp(value);
447-
$self->fixed_string_field(tmp);
448-
}
449-
450-
std::string fixed_string_field_str() const
451-
{
452-
return std::string($self->fixed_string_field(), strnlen($self->fixed_string_field(), 16));
453-
}
454-
}
455-
456-
457-
458-
>>>>>>> 57a5541 (Set CMAKE_SHARED_LIBRARY_SUFFIX to always create .so files (#207))
459401
%ignore eprosima::test::CompleteTestType::enum_field(eprosima::test::Color&&);
460402

461403

@@ -1754,35 +1696,6 @@ namespace swig {
17541696

17551697

17561698

1757-
<<<<<<< HEAD
1758-
=======
1759-
%ignore eprosima::test::KeyedCompleteTestType::fixed_string_field(eprosima::fastcdr::fixed_string<16>&&);
1760-
1761-
1762-
// Overloaded getter methods shadow each other and are equivalent in python
1763-
// Const accesors produced constant enums instead of arrays/dictionaries when used
1764-
// We ignore them to prevent this
1765-
%ignore eprosima::test::KeyedCompleteTestType::fixed_string_field();
1766-
%rename("%s") eprosima::test::KeyedCompleteTestType::fixed_string_field() const;
1767-
1768-
%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>;
1769-
%extend eprosima::test::KeyedCompleteTestType
1770-
{
1771-
void fixed_string_field(const std::string& value)
1772-
{
1773-
eprosima::fastcdr::fixed_string<16> tmp(value);
1774-
$self->fixed_string_field(tmp);
1775-
}
1776-
1777-
std::string fixed_string_field_str() const
1778-
{
1779-
return std::string($self->fixed_string_field(), strnlen($self->fixed_string_field(), 16));
1780-
}
1781-
}
1782-
1783-
1784-
1785-
>>>>>>> 57a5541 (Set CMAKE_SHARED_LIBRARY_SUFFIX to always create .so files (#207))
17861699
%ignore eprosima::test::KeyedCompleteTestType::enum_field(eprosima::test::Color&&);
17871700

17881701

0 commit comments

Comments
 (0)