Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compilation under CentOS 7 and Clang #415

Merged
merged 2 commits into from
Jan 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions include/powsybl/iidm/BusCache.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <mutex>
#include <string>

#include <powsybl/iidm/Bus.hpp>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove the foward declaration at line 24

#include <powsybl/stdcxx/optional.hpp>
#include <powsybl/stdcxx/range.hpp>
#include <powsybl/stdcxx/reference.hpp>
Expand All @@ -21,8 +22,6 @@ namespace powsybl {

namespace iidm {

class Bus;

class BusCache {
public:
using BusSupplier = std::function<stdcxx::const_range<Bus>()>;
Expand Down
2 changes: 1 addition & 1 deletion include/powsybl/stdcxx/flattened.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class FlatteningIterator :

struct FlattenForwarder {};

const FlattenForwarder flattened;
const FlattenForwarder flattened {};

template <typename SinglePassRange>
using FlattenRange = boost::iterator_range<FlatteningIterator<typename boost::range_iterator<SinglePassRange>::type>>;
Expand Down