diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2020-04-20 12:55:28 +0200 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2020-09-14 17:29:46 +0000 |
| commit | 1fc9a18f95fd2ff491679e4c8de519afe49d8c47 (patch) | |
| tree | 15a6cbe5fd92745ab9859ad701f9fc3e44737aaa /libtransport/includes | |
| parent | 9c1aa190114dcd0be16dd4ce49459955fc4f7434 (diff) | |
[HICN-598] [HICN-599] Fix hicn_name_t definition conflicts.
Change-Id: Ica8db44e27c3a4911ea869e91f96b781809373d8
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'libtransport/includes')
| -rw-r--r-- | libtransport/includes/hicn/transport/core/name.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libtransport/includes/hicn/transport/core/name.h b/libtransport/includes/hicn/transport/core/name.h index ea72797ad..46bbd107d 100644 --- a/libtransport/includes/hicn/transport/core/name.h +++ b/libtransport/includes/hicn/transport/core/name.h @@ -51,7 +51,6 @@ class Name { public: using NameStruct = hicn_name_t; - using Type = hicn_name_type_t; Name(); @@ -81,12 +80,12 @@ class Name { bool equals(const Name &name, bool consider_segment = true) const; + TRANSPORT_ALWAYS_INLINE bool isIp4() { return hicn_name_is_ip4(&name_); } + uint32_t getHash32(bool consider_suffix = true) const; void clear(); - Type getType() const; - uint32_t getSuffix() const; std::shared_ptr<Sockaddr> getAddress() const; @@ -125,14 +124,14 @@ struct compare2 {}; template <> struct compare2<transport::core::Name> { - size_t operator()(const transport::core::Name &name1, const transport::core::Name &name2) const; + size_t operator()(const transport::core::Name &name1, + const transport::core::Name &name2) const; }; } // end namespace core } // end namespace transport - namespace std { template <> struct hash<transport::core::Name> { |