Skip to content

Commit f74cdee

Browse files
acomodivaughnbetz
authored andcommitted
vpr: more specific class type array name
Signed-off-by: Alessandro Comodi <[email protected]>
1 parent f1d624f commit f74cdee

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

libs/libarchfpga/src/physical_types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,11 @@ enum e_pb_type_class {
184184
};
185185

186186
// Set of all pb_type classes
187-
constexpr std::array<e_pb_type_class, NUM_CLASSES> TYPE_CLASSES = {
187+
constexpr std::array<e_pb_type_class, NUM_CLASSES> PB_TYPE_CLASSES = {
188188
{UNKNOWN_CLASS, LUT_CLASS, LATCH_CLASS, MEMORY_CLASS}};
189189

190190
// String versions of pb_type class values
191-
constexpr std::array<const char*, NUM_CLASSES> TYPE_CLASS_STRING = {
191+
constexpr std::array<const char*, NUM_CLASSES> PB_TYPE_CLASS_STRING = {
192192
{"unknown", "lut", "flipflop", "memory"}};
193193

194194
/* Annotations for pin-to-pin connections */

libs/libarchfpga/src/read_xml_arch_file.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,11 +1020,11 @@ static void ProcessPb_Type(pugi::xml_node Parent, t_pb_type* pb_type, t_mode* mo
10201020
class_name = vtr::strdup(Prop);
10211021

10221022
if (class_name) {
1023-
if (0 == strcmp(class_name, TYPE_CLASS_STRING[LUT_CLASS])) {
1023+
if (0 == strcmp(class_name, PB_TYPE_CLASS_STRING[LUT_CLASS])) {
10241024
pb_type->class_type = LUT_CLASS;
1025-
} else if (0 == strcmp(class_name, TYPE_CLASS_STRING[LATCH_CLASS])) {
1025+
} else if (0 == strcmp(class_name, PB_TYPE_CLASS_STRING[LATCH_CLASS])) {
10261026
pb_type->class_type = LATCH_CLASS;
1027-
} else if (0 == strcmp(class_name, TYPE_CLASS_STRING[MEMORY_CLASS])) {
1027+
} else if (0 == strcmp(class_name, PB_TYPE_CLASS_STRING[MEMORY_CLASS])) {
10281028
pb_type->class_type = MEMORY_CLASS;
10291029
} else {
10301030
archfpga_throw(loc_data.filename_c_str(), loc_data.line(Parent),

0 commit comments

Comments
 (0)