From c5a9cb4646b68e84f00c2fdb7c6a75008a5df0c4 Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Mon, 10 Jun 2019 16:22:43 -0700 Subject: [PATCH] Correct class vs struct usage. yaml-lib defines convert as template struct convert Not as a class. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com> --- lib/include/prjxray/xilinx/xc7series/configuration_bus.h | 2 +- lib/include/prjxray/xilinx/xc7series/configuration_column.h | 2 +- lib/include/prjxray/xilinx/xc7series/global_clock_region.h | 2 +- lib/include/prjxray/xilinx/xc7series/part.h | 2 +- lib/include/prjxray/xilinx/xc7series/row.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/include/prjxray/xilinx/xc7series/configuration_bus.h b/lib/include/prjxray/xilinx/xc7series/configuration_bus.h index 8b3e9bdf..33e9619e 100644 --- a/lib/include/prjxray/xilinx/xc7series/configuration_bus.h +++ b/lib/include/prjxray/xilinx/xc7series/configuration_bus.h @@ -42,7 +42,7 @@ class ConfigurationBus { FrameAddress address) const; private: - friend class YAML::convert; + friend struct YAML::convert; std::map configuration_columns_; }; diff --git a/lib/include/prjxray/xilinx/xc7series/configuration_column.h b/lib/include/prjxray/xilinx/xc7series/configuration_column.h index b4615c5b..b15415e2 100644 --- a/lib/include/prjxray/xilinx/xc7series/configuration_column.h +++ b/lib/include/prjxray/xilinx/xc7series/configuration_column.h @@ -36,7 +36,7 @@ class ConfigurationColumn { FrameAddress address) const; private: - friend class YAML::convert; + friend struct YAML::convert; unsigned int frame_count_; }; diff --git a/lib/include/prjxray/xilinx/xc7series/global_clock_region.h b/lib/include/prjxray/xilinx/xc7series/global_clock_region.h index 39747f3b..75b6de2d 100644 --- a/lib/include/prjxray/xilinx/xc7series/global_clock_region.h +++ b/lib/include/prjxray/xilinx/xc7series/global_clock_region.h @@ -45,7 +45,7 @@ class GlobalClockRegion { FrameAddress address) const; private: - friend class YAML::convert; + friend struct YAML::convert; std::map rows_; }; diff --git a/lib/include/prjxray/xilinx/xc7series/part.h b/lib/include/prjxray/xilinx/xc7series/part.h index ca7749d0..90847e44 100644 --- a/lib/include/prjxray/xilinx/xc7series/part.h +++ b/lib/include/prjxray/xilinx/xc7series/part.h @@ -40,7 +40,7 @@ class Part { FrameAddress address) const; private: - friend class YAML::convert; + friend struct YAML::convert; uint32_t idcode_; GlobalClockRegion top_region_; diff --git a/lib/include/prjxray/xilinx/xc7series/row.h b/lib/include/prjxray/xilinx/xc7series/row.h index 8dd8d9cc..4cb7f567 100644 --- a/lib/include/prjxray/xilinx/xc7series/row.h +++ b/lib/include/prjxray/xilinx/xc7series/row.h @@ -41,7 +41,7 @@ class Row { FrameAddress address) const; private: - friend class YAML::convert; + friend struct YAML::convert; std::map configuration_buses_; };