Merge pull request #878 from litghost/fix_yaml

Correct class vs struct usage.
This commit is contained in:
Tim Ansell 2019-06-11 09:04:16 +02:00 committed by GitHub
commit 80f42b7e00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions

View File

@ -42,7 +42,7 @@ class ConfigurationBus {
FrameAddress address) const;
private:
friend class YAML::convert<ConfigurationBus>;
friend struct YAML::convert<ConfigurationBus>;
std::map<unsigned int, ConfigurationColumn> configuration_columns_;
};

View File

@ -36,7 +36,7 @@ class ConfigurationColumn {
FrameAddress address) const;
private:
friend class YAML::convert<ConfigurationColumn>;
friend struct YAML::convert<ConfigurationColumn>;
unsigned int frame_count_;
};

View File

@ -45,7 +45,7 @@ class GlobalClockRegion {
FrameAddress address) const;
private:
friend class YAML::convert<GlobalClockRegion>;
friend struct YAML::convert<GlobalClockRegion>;
std::map<unsigned int, Row> rows_;
};

View File

@ -40,7 +40,7 @@ class Part {
FrameAddress address) const;
private:
friend class YAML::convert<Part>;
friend struct YAML::convert<Part>;
uint32_t idcode_;
GlobalClockRegion top_region_;

View File

@ -41,7 +41,7 @@ class Row {
FrameAddress address) const;
private:
friend class YAML::convert<Row>;
friend struct YAML::convert<Row>;
std::map<BlockType, ConfigurationBus> configuration_buses_;
};