Skip to content

Commit 31807c7

Browse files
committed
Refs #20566: Change fixed_size_string namespace from fastrtps to fastcdr
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
1 parent 15c73e8 commit 31807c7

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

src/main/java/com/eprosima/fastdds/idl/parser/typecode/StringTypeCode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public String getCppTypename()
6565
{
6666
if (Kind.KIND_STRING == getKind() && isIsBounded() && ctx instanceof com.eprosima.fastcdr.idl.context.Context && ((com.eprosima.fastcdr.idl.context.Context)ctx).isCdrv1TemplatesEnabled())
6767
{
68-
return "eprosima::fastrtps::fixed_string<" + getMaxsize() + ">";
68+
return "eprosima::fastcdr::fixed_string<" + getMaxsize() + ">";
6969
}
7070

7171
return super.getCppTypename();

src/main/java/com/eprosima/fastdds/idl/templates/SerializationSource.stg

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,11 +1051,8 @@ external_suffix(p, external) ::= <<$p$$if(external)$->$else$.$endif$>>
10511051
cppTypenameBetweenCdrVersions(typecode) ::= <<
10521052
$if(typecode.isStringType && typecode.isBounded)$
10531053
$! Avoid error with namespace when generated fixed_string depending on CDR version !$
1054-
#if FASTCDR_VERSION_MAJOR == 1
1055-
eprosima::fastrtps::fixed_string<$typecode.maxsize$>
1056-
#else
10571054
eprosima::fastcdr::fixed_string<$typecode.maxsize$>
1058-
#endif
1055+
10591056

10601057
$else$
10611058
$typecode.cppTypename$

0 commit comments

Comments
 (0)