Making C++ classes final

[iot2.git] / iotjava / iotrmi / C++ / IoTRMITypes.hpp

diff --git a/iotjava/iotrmi/C++/IoTRMITypes.hpp b/iotjava/iotrmi/C++/IoTRMITypes.hpp
index 2c32f47a8d25f7ffd384924b99b292c999ed9663..673479ecd8bf96654e8b6c0fddbbbe863b3045b7 100644 (file)
--- a/iotjava/iotrmi/C++/IoTRMITypes.hpp
+++ b/iotjava/iotrmi/C++/IoTRMITypes.hpp
@@ -16,7 +16,7 @@
 
 using namespace std;
 
-class IoTRMITypes {
+class IoTRMITypes final {
 
        public:
                /* Public constants */
@@ -36,15 +36,9 @@ class IoTRMITypes {
 
 
                /**
-                * Primitive sizes in Java - Long is 8 bytes and char is 2 bytes
+                * Primitive sizes in Java/C++
                 */
-               const static int primitivesJavaSizes[NUM_PRIMITIVES];
-
-
-               /**
-                * Primitive sizes in Cplus - Long is 4 bytes and char is 1 byte
-                */
-               const static int primitivesCplusSizes[NUM_PRIMITIVES];
+               const static int primitivesSizes[NUM_PRIMITIVES];
 
 
                /**
@@ -117,13 +111,7 @@ const string IoTRMITypes::primitivesCplus[IoTRMITypes::NUM_PRIMITIVES] = {
 };
 
 
-const int IoTRMITypes::primitivesJavaSizes[IoTRMITypes::NUM_PRIMITIVES] = {
-
-       1, 1, 2, 2, 4, 4, 8, 8, 4, 4, 8, 8, 1, 1, 2, 2, -1, -1, 0
-};
-
-
-const int IoTRMITypes::primitivesCplusSizes[IoTRMITypes::NUM_PRIMITIVES] = {
+const int IoTRMITypes::primitivesSizes[IoTRMITypes::NUM_PRIMITIVES] = {
 
        1, 1, 2, 2, 4, 4, 8, 8, 4, 4, 8, 8, 1, 1, 2, 2, -1, -1, 0
 };