ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-02-21 01:31:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Checkpoints cannot handle overloaded names

Browse Source 
I think I ran into this before.  The offsetof calls that use
fully qualified fields in classes is not compilable using clang
on the Mac.  So I've decided to only conditionally compile this
code for non Apple platforms.  So this fix will work in Linux,
but not on Macs.  We'll have to revisit this and see if we
can make it work for both.

refers to #31
This commit is contained in:
Alex Lin 2015-03-25 17:15:42 -05:00
parent 6d13282e90
commit 94b2a4eff0
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
trick_source/codegen/Interface_Code_Gen/ClassValues.cpp
View File

@ -29,6 +29,9 @@ ClassValues::~ClassValues() {
void ClassValues::addFieldDescription(FieldDescription * in_fdes) {
field_descripts.push_back(in_fdes) ;
// This section creates code that clang on the Mac cannot compile.
// So, we cannot handle overloaded names on the Mac.
#ifndef __APPLE__
// Test to see if the new field overloads a field of the same name. If it does
// then fully qualify the name of the inherited field (the one already in field_name_to_info).
std::map< std::string , FieldDescription * >::iterator mit = field_name_to_info_map.find(in_fdes->getName()) ;
@ -40,6 +43,7 @@ void ClassValues::addFieldDescription(FieldDescription * in_fdes) {
field_name_to_info_map.erase(mit) ;
}
}
#endif
field_name_to_info_map[in_fdes->getName()] = in_fdes ;
}
@ -48,6 +52,9 @@ void ClassValues::addInheritedFieldDescriptions(std::vector<FieldDescription *>
// Make a copy of all of the FieldDescription variables.
field_descripts.insert(field_descripts.end(), in_fdes.begin() , in_fdes.end()) ;
// This section creates code that clang on the Mac cannot compile.
// So, we cannot handle overloaded names on the Mac.
#ifndef __APPLE__
std::vector<FieldDescription *>::iterator fdit ;
// Loop through the incoming inherited variable names
for ( fdit = in_fdes.begin() ; fdit != in_fdes.end() ; fdit++ ) {
@ -84,6 +91,7 @@ void ClassValues::addInheritedFieldDescriptions(std::vector<FieldDescription *>
}
}
}
#endif
}