diff --git a/src/source_package_publishing_history.cpp b/src/source_package_publishing_history.cpp index 893cdea..67ab538 100644 --- a/src/source_package_publishing_history.cpp +++ b/src/source_package_publishing_history.cpp @@ -17,6 +17,7 @@ #include "binary_package_publishing_history.h" #include "build.h" #include "launchpad.h" +#include "distro_series.h" #include #include @@ -26,7 +27,7 @@ source_package_publishing_history::source_package_publishing_history() self_link(""), distro_series_link(""), lp(nullptr), - distro_series([this]() -> std::optional { + distro_series([this]() -> std::optional<::distro_series> { if (distro_series_link.empty()) return std::nullopt; if (_distro_series) return _distro_series; @@ -34,7 +35,7 @@ source_package_publishing_history::source_package_publishing_history() if (!response) return std::nullopt; auto data = nlohmann::json::parse(response.value()); - auto ds = distro_series::parse(data.dump()); + auto ds = ::distro_series::parse(data.dump()); if (ds) { ds->set_lp(lp); diff --git a/src/source_package_publishing_history.h b/src/source_package_publishing_history.h index e382d8e..4f33812 100644 --- a/src/source_package_publishing_history.h +++ b/src/source_package_publishing_history.h @@ -43,7 +43,7 @@ public: void parse_json(const std::string& json_data); std::generator getBuilds() const; - lazy_optional()>> distro_series; + lazy_optional<::distro_series, std::function()>> distro_series; std::generator getPublishedBinaries(bool active_binaries_only = false) const; bool requestDeletion(const std::string& removal_comment = ""); @@ -58,7 +58,7 @@ public: private: launchpad* lp; - std::optional _distro_series = std::nullopt; + std::optional<::distro_series> _distro_series = std::nullopt; }; #endif // SOURCE_PACKAGE_PUBLISHING_HISTORY