Fix build error due to toolchain upgrade

error: expected unqualified-id before numeric constant

Change-Id: I80ff5d51ad283b88d586bf01656a868b7043d355
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/binary_xmlresource/binary_xmlresource.cpp b/binary_xmlresource/binary_xmlresource.cpp
index f7efd9c..25b29e3 100644 (file)
--- a/binary_xmlresource/binary_xmlresource.cpp
+++ b/binary_xmlresource/binary_xmlresource.cpp
@@ -70,15 +70,15 @@ void BinResource::init(const char *entry_filepath) {
         return;
     }
 
-    const int SIZE_WIDTH = 8;
+    const int _SIZE_WIDTH = 8;
     const int OFFSET_WIDTH = 8;
     int size_table[MAX_DATATYPE] = {0};
     int offset_table[MAX_DATATYPE] = {0};
     {
         FileStorage headerStorage;
-        headerStorage.get_storage(storageAllData, 0, MAX_DATATYPE * (SIZE_WIDTH + OFFSET_WIDTH));
+        headerStorage.get_storage(storageAllData, 0, MAX_DATATYPE * (_SIZE_WIDTH + OFFSET_WIDTH));
         for (int i = ALLDATA; i < MAX_DATATYPE; ++i) {
-            size_table[i] = headerStorage.get<sint_t>(SIZE_WIDTH);
+            size_table[i] = headerStorage.get<sint_t>(_SIZE_WIDTH);
             offset_table[i] = headerStorage.get<sint_t>(OFFSET_WIDTH);
         }
     }

diff --git a/xml2binary/encode_label_properties_frame.cpp b/xml2binary/encode_label_properties_frame.cpp
index 418e3a3..580905e 100644 (file)
--- a/xml2binary/encode_label_properties_frame.cpp
+++ b/xml2binary/encode_label_properties_frame.cpp
@@ -85,7 +85,7 @@ encode_label_properties_frame_file(ResourceStorage& storage, IMetaData_Helper& m
     int init_size = storage.get_size();
 
     /*size 4bytes*/
-    const int SIZE_WIDTH = 4;
+    const int _SIZE_WIDTH = 4;
 
     XMLResource *xmlresource = XMLResource::get_instance();
     PSclLabelPropertiesTable labelPropertiesFrame = xmlresource->get_label_properties_frame();
@@ -99,8 +99,8 @@ encode_label_properties_frame_file(ResourceStorage& storage, IMetaData_Helper& m
 
     storage.reserve(8);
 
-    storage.put<sint_t>(size, SIZE_WIDTH);
-    storage.put<sint_t>(maxj, SIZE_WIDTH);
+    storage.put<sint_t>(size, _SIZE_WIDTH);
+    storage.put<sint_t>(maxj, _SIZE_WIDTH);
 
     Label_properties_record_width record_width;
     set_label_properties_record_width(md_helper, record_width);

diff --git a/xml2binary/xml2dat.cpp b/xml2binary/xml2dat.cpp
index 7098fae..c5bf4dd 100644 (file)
--- a/xml2binary/xml2dat.cpp
+++ b/xml2binary/xml2dat.cpp
@@ -130,13 +130,13 @@ int main(const int argc, char* argv[]) {
 
     int size_table[MAX_DATATYPE] = {0};
     int offset_table[MAX_DATATYPE] = {0};
-    const int SIZE_WIDTH = 8;
+    const int _SIZE_WIDTH = 8;
     const int OFFSET_WIDTH = 8;
     int offset = 0;
     {
         //Reserve for size_table
         ResourceStorage rs;
-        rs.reserve(MAX_DATATYPE * (SIZE_WIDTH + OFFSET_WIDTH));
+        rs.reserve(MAX_DATATYPE * (_SIZE_WIDTH + OFFSET_WIDTH));
         int ret = rs.toFile(bin_file, offset);
         if (ret < 0) {
             printf("error\n");