Fix error -Werror=shadow

Fix constructor parameter identifier to be suffixed with _.

Change-Id: I8a56b643387e68d3c9031e2324f7acec388ffdfd
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/src/dynamic-partitions/liblp/include/liblp/builder.h b/src/dynamic-partitions/liblp/include/liblp/builder.h
index ddfc64e..ec0b444 100644 (file)
--- a/src/dynamic-partitions/liblp/include/liblp/builder.h
+++ b/src/dynamic-partitions/liblp/include/liblp/builder.h
@@ -170,8 +170,8 @@ struct Interval {
     uint64_t start;
     uint64_t end;
 
-    Interval(uint32_t device_index, uint64_t start, uint64_t end)
-        : device_index(device_index), start(start), end(end) {}
+    Interval(uint32_t device_index_, uint64_t start_, uint64_t end_)
+        : device_index(device_index_), start(start_), end(end_) {}
     uint64_t length() const { return end - start; }
 
     // Note: the device index is not included in sorting (intervals are

diff --git a/src/dynamic-partitions/liblp/include/liblp/partition_opener.h b/src/dynamic-partitions/liblp/include/liblp/partition_opener.h
index 35c9c9a..f67b5fa 100644 (file)
--- a/src/dynamic-partitions/liblp/include/liblp/partition_opener.h
+++ b/src/dynamic-partitions/liblp/include/liblp/partition_opener.h
@@ -25,13 +25,13 @@ namespace fs_mgr {
 
 struct BlockDeviceInfo {
     BlockDeviceInfo() : size(0), alignment(0), alignment_offset(0), logical_block_size(0) {}
-    BlockDeviceInfo(const std::string& partition_name, uint64_t size, uint32_t alignment,
-                    uint32_t alignment_offset, uint32_t logical_block_size)
-        : size(size),
-          alignment(alignment),
-          alignment_offset(alignment_offset),
-          logical_block_size(logical_block_size),
-          partition_name(partition_name) {}
+    BlockDeviceInfo(const std::string& partition_name_, uint64_t size_, uint32_t alignment_,
+                    uint32_t alignment_offset_, uint32_t logical_block_size_)
+        : size(size_),
+          alignment(alignment_),
+          alignment_offset(alignment_offset_),
+          logical_block_size(logical_block_size_),
+          partition_name(partition_name_) {}
     // Size of the block device, in bytes.
     uint64_t size;
     // Optimal target alignment, in bytes. Partition extents will be aligned to