Skip to content

Commit

Permalink
Fix linking issues with libswoc 1.2.6.
Browse files Browse the repository at this point in the history
  • Loading branch information
SolidWallOfCode committed Jun 4, 2020
1 parent 6938183 commit e1be041
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 16 deletions.
2 changes: 1 addition & 1 deletion Sconstruct
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ AddOption("--with-ssl",

# the depends
Part("code/libswoc.part"
,vcs_type=VcsGit(server="github.com", repository="SolidWallOfCode/libswoc", tag="1.2.5")
,vcs_type=VcsGit(server="github.com", repository="SolidWallOfCode/libswoc", tag="1.2.6")
)
Part("#lib/libyaml-cpp.part", vcs_type=VcsGit(server="github.com", repository="jbeder/yaml-cpp.git", protocol="https", tag="yaml-cpp-0.6.3"))
#Part("#lib/libyaml-cpp.part")
Expand Down
15 changes: 0 additions & 15 deletions plugin/include/txn_box/Config.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,6 @@ enum class FeatureNodeStyle {
TUPLE, ///< Structure is suitable for a list of features.
};

// Temporary - this will be available in libswoc 1.2.6+. Until then, patch locally.
namespace std {

template <> struct hash<swoc::file::path> {
size_t operator()(swoc::file::path const& arg) const { return hash<string_view>()(arg.view()); }
};

} // namespace std

namespace swoc { inline namespace SWOC_VERSION_NS { namespace file {
inline bool operator == (path const& lhs, path const& rhs) {
return lhs.view() == rhs.view();
}
}}}

/// Contains a configuration and configuration helper methods.
/// This is also used to pass information between node parsing during configuration loading.
class Config {
Expand Down

0 comments on commit e1be041

Please sign in to comment.