From f2d93917c21034b9641d27e7eafc296842611dc4 Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Wed, 20 Mar 2019 10:46:33 -0700 Subject: [PATCH] [style] remove using decls from global namespace in headers (#3705) --- src/core/coap/coap_message.hpp | 4 ++-- src/core/common/tlvs.hpp | 4 ++-- src/core/meshcop/meshcop_tlvs.hpp | 6 +++--- src/core/meshcop/timestamp.hpp | 4 ++-- src/core/net/dhcp6.hpp | 6 +++--- src/core/net/dns_headers.hpp | 6 +++--- src/core/net/icmp6.hpp | 4 ++-- src/core/net/ip6.hpp | 6 +++--- src/core/net/ip6_headers.hpp | 6 +++--- src/core/net/sntp_client.hpp | 2 ++ src/core/thread/lowpan.hpp | 2 ++ src/core/thread/mle_tlvs.hpp | 6 +++--- src/core/thread/network_data_tlvs.hpp | 4 ++-- src/core/thread/network_diagnostic_tlvs.hpp | 6 +++--- src/core/thread/thread_tlvs.hpp | 4 ++-- 15 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/core/coap/coap_message.hpp b/src/core/coap/coap_message.hpp index 3dc88e303..6b321dd63 100644 --- a/src/core/coap/coap_message.hpp +++ b/src/core/coap/coap_message.hpp @@ -45,8 +45,6 @@ #include "common/message.hpp" #include "utils/static_assert.hpp" -using ot::Encoding::BigEndian::HostSwap16; - namespace ot { /** @@ -57,6 +55,8 @@ namespace ot { */ namespace Coap { +using ot::Encoding::BigEndian::HostSwap16; + /** * @addtogroup core-coap * diff --git a/src/core/common/tlvs.hpp b/src/core/common/tlvs.hpp index 2f5e2b8b7..ae84d7400 100644 --- a/src/core/common/tlvs.hpp +++ b/src/core/common/tlvs.hpp @@ -41,11 +41,11 @@ #include "common/encoding.hpp" #include "common/message.hpp" +namespace ot { + using ot::Encoding::BigEndian::HostSwap16; using ot::Encoding::BigEndian::HostSwap32; -namespace ot { - /** * This class implements TLV generation and parsing. * diff --git a/src/core/meshcop/meshcop_tlvs.hpp b/src/core/meshcop/meshcop_tlvs.hpp index 9ab4f5727..e0664cdfe 100644 --- a/src/core/meshcop/meshcop_tlvs.hpp +++ b/src/core/meshcop/meshcop_tlvs.hpp @@ -51,13 +51,13 @@ #include "net/ip6_address.hpp" #include "phy/phy.hpp" +namespace ot { +namespace MeshCoP { + using ot::Encoding::Reverse32; using ot::Encoding::BigEndian::HostSwap16; using ot::Encoding::BigEndian::HostSwap32; -namespace ot { -namespace MeshCoP { - /** * This class implements MeshCoP TLV generation and parsing. * diff --git a/src/core/meshcop/timestamp.hpp b/src/core/meshcop/timestamp.hpp index 4e9258f5b..03cd3eb41 100644 --- a/src/core/meshcop/timestamp.hpp +++ b/src/core/meshcop/timestamp.hpp @@ -43,11 +43,11 @@ #include "common/encoding.hpp" -using ot::Encoding::BigEndian::HostSwap16; - namespace ot { namespace MeshCoP { +using ot::Encoding::BigEndian::HostSwap16; + /** * This class implements Timestamp generation and parsing. * diff --git a/src/core/net/dhcp6.hpp b/src/core/net/dhcp6.hpp index 7f7c505ea..5251cfd4a 100644 --- a/src/core/net/dhcp6.hpp +++ b/src/core/net/dhcp6.hpp @@ -39,12 +39,12 @@ #include "common/message.hpp" #include "net/udp6.hpp" -using ot::Encoding::BigEndian::HostSwap16; -using ot::Encoding::BigEndian::HostSwap32; - namespace ot { namespace Dhcp6 { +using ot::Encoding::BigEndian::HostSwap16; +using ot::Encoding::BigEndian::HostSwap32; + /** * @addtogroup core-dhcp6 * diff --git a/src/core/net/dns_headers.hpp b/src/core/net/dns_headers.hpp index 36154aade..54edf061b 100644 --- a/src/core/net/dns_headers.hpp +++ b/src/core/net/dns_headers.hpp @@ -41,9 +41,6 @@ #include "common/encoding.hpp" #include "common/message.hpp" -using ot::Encoding::BigEndian::HostSwap16; -using ot::Encoding::BigEndian::HostSwap32; - namespace ot { /** @@ -54,6 +51,9 @@ namespace ot { */ namespace Dns { +using ot::Encoding::BigEndian::HostSwap16; +using ot::Encoding::BigEndian::HostSwap32; + /** * @addtogroup core-dns * diff --git a/src/core/net/icmp6.hpp b/src/core/net/icmp6.hpp index 6d6441589..b9289ac02 100644 --- a/src/core/net/icmp6.hpp +++ b/src/core/net/icmp6.hpp @@ -42,11 +42,11 @@ #include "common/locator.hpp" #include "net/ip6_headers.hpp" -using ot::Encoding::BigEndian::HostSwap16; - namespace ot { namespace Ip6 { +using ot::Encoding::BigEndian::HostSwap16; + /** * @addtogroup core-ip6-icmp6 * diff --git a/src/core/net/ip6.hpp b/src/core/net/ip6.hpp index f28b2c3db..212c5582f 100644 --- a/src/core/net/ip6.hpp +++ b/src/core/net/ip6.hpp @@ -53,9 +53,6 @@ #include "net/socket.hpp" #include "net/udp6.hpp" -using ot::Encoding::BigEndian::HostSwap16; -using ot::Encoding::BigEndian::HostSwap32; - namespace ot { /** @@ -67,6 +64,9 @@ namespace ot { */ namespace Ip6 { +using ot::Encoding::BigEndian::HostSwap16; +using ot::Encoding::BigEndian::HostSwap32; + /** * @addtogroup core-ipv6 * diff --git a/src/core/net/ip6_headers.hpp b/src/core/net/ip6_headers.hpp index 293c7f5cb..427901584 100644 --- a/src/core/net/ip6_headers.hpp +++ b/src/core/net/ip6_headers.hpp @@ -44,9 +44,6 @@ #include "net/netif.hpp" #include "net/socket.hpp" -using ot::Encoding::BigEndian::HostSwap16; -using ot::Encoding::BigEndian::HostSwap32; - namespace ot { /** @@ -58,6 +55,9 @@ namespace ot { */ namespace Ip6 { +using ot::Encoding::BigEndian::HostSwap16; +using ot::Encoding::BigEndian::HostSwap32; + /** * @addtogroup core-ipv6 * diff --git a/src/core/net/sntp_client.hpp b/src/core/net/sntp_client.hpp index eb135ea5e..31e0c5216 100644 --- a/src/core/net/sntp_client.hpp +++ b/src/core/net/sntp_client.hpp @@ -46,6 +46,8 @@ namespace ot { namespace Sntp { +using ot::Encoding::BigEndian::HostSwap32; + /** * This class implements SNTP header generation and parsing. * diff --git a/src/core/thread/lowpan.hpp b/src/core/thread/lowpan.hpp index 62ce285bf..42ff65bd2 100644 --- a/src/core/thread/lowpan.hpp +++ b/src/core/thread/lowpan.hpp @@ -63,6 +63,8 @@ namespace ot { */ namespace Lowpan { +using ot::Encoding::BigEndian::HostSwap16; + /** * This structure represents a LOWPAN_IPHC Context. * diff --git a/src/core/thread/mle_tlvs.hpp b/src/core/thread/mle_tlvs.hpp index 4f61c40a5..8861c47bd 100644 --- a/src/core/thread/mle_tlvs.hpp +++ b/src/core/thread/mle_tlvs.hpp @@ -45,13 +45,13 @@ #include "net/ip6_address.hpp" #include "thread/mle_constants.hpp" -using ot::Encoding::BigEndian::HostSwap16; -using ot::Encoding::BigEndian::HostSwap32; - namespace ot { namespace Mle { +using ot::Encoding::BigEndian::HostSwap16; +using ot::Encoding::BigEndian::HostSwap32; + #define TLVREQUESTTLV_ITERATOR_INIT 0 ///< Initializer for TlvRequestTlvIterator. typedef uint8_t TlvRequestIterator; ///< Used to iterate through TlvRequestTlv. diff --git a/src/core/thread/network_data_tlvs.hpp b/src/core/thread/network_data_tlvs.hpp index 4de23f10f..82067225d 100644 --- a/src/core/thread/network_data_tlvs.hpp +++ b/src/core/thread/network_data_tlvs.hpp @@ -41,13 +41,13 @@ #include "common/encoding.hpp" #include "net/ip6_address.hpp" -using ot::Encoding::BigEndian::HostSwap16; - #define THREAD_ENTERPRISE_NUMBER 44970 namespace ot { namespace NetworkData { +using ot::Encoding::BigEndian::HostSwap16; + /** * @addtogroup core-netdata-tlvs * diff --git a/src/core/thread/network_diagnostic_tlvs.hpp b/src/core/thread/network_diagnostic_tlvs.hpp index 8af817450..c98afbede 100644 --- a/src/core/thread/network_diagnostic_tlvs.hpp +++ b/src/core/thread/network_diagnostic_tlvs.hpp @@ -48,13 +48,13 @@ #include "phy/phy.hpp" #include "thread/mle_constants.hpp" -using ot::Encoding::BigEndian::HostSwap16; -using ot::Encoding::BigEndian::HostSwap32; - namespace ot { namespace NetworkDiagnostic { +using ot::Encoding::BigEndian::HostSwap16; +using ot::Encoding::BigEndian::HostSwap32; + /** * @addtogroup core-mle-tlvs * diff --git a/src/core/thread/thread_tlvs.hpp b/src/core/thread/thread_tlvs.hpp index 8c366181b..642406fee 100644 --- a/src/core/thread/thread_tlvs.hpp +++ b/src/core/thread/thread_tlvs.hpp @@ -42,11 +42,11 @@ #include "net/ip6_address.hpp" #include "thread/mle.hpp" +namespace ot { + using ot::Encoding::BigEndian::HostSwap16; using ot::Encoding::BigEndian::HostSwap32; -namespace ot { - enum { kCoapUdpPort = 61631,