Move TypeDescriptor::stateTable from header to implementation. (#2015)

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> (cherry picked from commit 1f2636a)
eProsima · Oct 19, 2021 · 984ac73 · 984ac73
1 parent 0f52b7e
commit 984ac73
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/include/fastrtps/types/TypeDescriptor.h b/include/fastrtps/types/TypeDescriptor.h
@@ -25,23 +25,6 @@ namespace eprosima {
 namespace fastrtps {
 namespace types {
 
-enum FSM_INPUTS
-{
-    LETTER = 1,
-    NUMBER,
-    UNDERSCORE,
-    COLON,
-    OTHER
-};
-
-enum FSM_STATES
-{
-    INVALID = 0,
-    SINGLECOLON,
-    DOUBLECOLON,
-    VALID
-};
-
 class TypeDescriptor
 {
 protected:
@@ -55,13 +38,6 @@ class TypeDescriptor
     DynamicType_ptr key_element_type_;      // Key Type for maps.
     std::vector<AnnotationDescriptor*> annotation_; // Annotations to apply
 
-    const int stateTable[4][6] = {
-        /* Input:     letter,  number,  underscore, colon,       other */
-        {INVALID,     VALID,   INVALID, INVALID,    INVALID,     INVALID},
-        {SINGLECOLON, INVALID, INVALID, INVALID,    DOUBLECOLON, INVALID},
-        {DOUBLECOLON, VALID,   INVALID, INVALID,    INVALID,     INVALID},
-        {VALID,       VALID,   VALID,   VALID,      SINGLECOLON, INVALID}};
-
     void clean();
 
     bool is_type_name_consistent(

diff --git a/src/cpp/dynamic-types/TypeDescriptor.cpp b/src/cpp/dynamic-types/TypeDescriptor.cpp
@@ -25,6 +25,32 @@ namespace eprosima {
 namespace fastrtps {
 namespace types {
 
+enum FSM_INPUTS
+{
+    LETTER = 1,
+    NUMBER,
+    UNDERSCORE,
+    COLON,
+    OTHER
+};
+
+enum FSM_STATES
+{
+    INVALID = 0,
+    SINGLECOLON,
+    DOUBLECOLON,
+    VALID
+};
+
+static const int stateTable[4][6] =
+{
+    /* Input:     letter,  number,  underscore, colon,       other */
+    {INVALID,     VALID,   INVALID, INVALID,    INVALID,     INVALID},
+    {SINGLECOLON, INVALID, INVALID, INVALID,    DOUBLECOLON, INVALID},
+    {DOUBLECOLON, VALID,   INVALID, INVALID,    INVALID,     INVALID},
+    {VALID,       VALID,   VALID,   VALID,      SINGLECOLON, INVALID}
+};
+
 TypeDescriptor::TypeDescriptor()
     : kind_(0)
     , name_("")