Removed deprecated unary_function and binary_function

Signed-off-by: Andrea Barberio <[email protected]>
insomniacslk · Jan 2, 2025 · 9946d9a · 9946d9a
1 parent af52c54
commit 9946d9a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -247,10 +247,11 @@ make
 
 You need the latest XCode installed to build this project. Then run:
 ```bash
-brew install https://raw.githubusercontent.com/insomniacslk/dublin-traceroute/master/homebrew/dublin-traceroute.rb
+wget https://raw.githubusercontent.com/insomniacslk/dublin-traceroute/master/homebrew/dublin-traceroute.rb
+brew install ./dublin-traceroute.rb
 ```
 
-This will be as simple as `brew install dublin-traceroute` after https://github.com/Homebrew/homebrew/pull/50000 will be merged.
+Unfortunately `dublin-traceroute` is not part of Homebrew's base packages, see <https://github.com/Homebrew/homebrew/pull/50000>.
 
 Please [file an issue](https://github.com/insomniacslk/dublin-traceroute/issues/new/choose) with the necessary details if this doesn't work for you.
 

diff --git a/googletest b/googletest
diff --git a/include/dublintraceroute/icmp_messages.h b/include/dublintraceroute/icmp_messages.h
@@ -24,14 +24,14 @@
 typedef std::tuple<uint8_t, uint8_t> icmpmessage_t;
 
 
-struct icmpmessage_hash: public std::unary_function<icmpmessage_t, std::size_t> {
+struct icmpmessage_hash {
 	std::size_t operator()(const icmpmessage_t &key) const {
 		return std::get<0>(key) ^ std::get<1>(key);
 	}
 };
 
 
-struct icmpmessage_equals: public std::binary_function<icmpmessage_t, icmpmessage_t, bool> {
+struct icmpmessage_equals {
 	bool operator()(const icmpmessage_t &left, const icmpmessage_t &right) const {
 		return (
 			std::get<0>(left) == std::get<0>(right) &&