diff --git a/Sconstruct b/Sconstruct index e2f93de..7fa1bb5 100644 --- a/Sconstruct +++ b/Sconstruct @@ -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") diff --git a/plugin/include/txn_box/Config.h b/plugin/include/txn_box/Config.h index 577684b..57f03ae 100644 --- a/plugin/include/txn_box/Config.h +++ b/plugin/include/txn_box/Config.h @@ -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 { - size_t operator()(swoc::file::path const& arg) const { return hash()(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 {