update namespace code style

IronsDu · Oct 18, 2018 · 0bc3b81 · 0bc3b81
1 parent 1ed5d98
commit 0bc3b81
Show file tree

Hide file tree

Showing 41 changed files with 3,919 additions and 3,933 deletions.
diff --git a/examples/BenchWebsocket.cpp b/examples/BenchWebsocket.cpp
@@ -12,6 +12,8 @@
 
 using namespace brynet;
 using namespace brynet::net;
+using namespace brynet::net::http;
+using namespace brynet::utils;
 
 std::atomic<int32_t> count;
 

diff --git a/examples/BroadCastClient.cpp b/examples/BroadCastClient.cpp
@@ -20,6 +20,7 @@
 using namespace std;
 using namespace brynet;
 using namespace brynet::net;
+using namespace brynet::utils;
 
 atomic_llong  TotalRecvPacketNum = ATOMIC_VAR_INIT(0);
 atomic_llong TotalRecvSize = ATOMIC_VAR_INIT(0);

diff --git a/examples/BroadCastServer.cpp b/examples/BroadCastServer.cpp
@@ -18,6 +18,7 @@
 
 using namespace brynet;
 using namespace brynet::net;
+using namespace brynet::utils;
 
 std::atomic_llong TotalSendLen = ATOMIC_VAR_INIT(0);
 std::atomic_llong TotalRecvLen = ATOMIC_VAR_INIT(0);

diff --git a/examples/TestHttp.cpp b/examples/TestHttp.cpp
@@ -11,6 +11,7 @@
 
 using namespace brynet;
 using namespace brynet::net;
+using namespace brynet::net::http;
 
 int main(int argc, char **argv)
 {

diff --git a/examples/TestPromiseReceive.cpp b/examples/TestPromiseReceive.cpp
@@ -11,6 +11,7 @@
 
 using namespace brynet;
 using namespace brynet::net;
+using namespace brynet::net::http;
 
 int main(int argc, char **argv)
 {

diff --git a/src/brynet/net/Any.h b/src/brynet/net/Any.h
@@ -8,25 +8,23 @@
 #include <cstdint>
 #endif
 
-namespace brynet
-{
-    namespace net
-    {
+namespace brynet { namespace net {
+
 #ifdef HAVE_LANG_CXX17
-        typedef std::any BrynetAny;
+    using BrynetAny = std::any;
 
-        template<typename T>
-        auto cast(const BrynetAny& ud)
-        {
-            return std::any_cast<T>(&ud);
-        }
+    template<typename T>
+    auto cast(const BrynetAny& ud)
+    {
+        return std::any_cast<T>(&ud);
+    }
 #else
-        typedef int64_t BrynetAny;
-        template<typename T>
-        const T* cast(const BrynetAny& ud)
-        {
-            return static_cast<const T*>(&ud);
-        }
-#endif
+    using BrynetAny = int64_t;
+    template<typename T>
+    const T* cast(const BrynetAny& ud)
+    {
+        return static_cast<const T*>(&ud);
     }
-}
+#endif
+
+} }
diff --git a/src/brynet/net/Channel.h b/src/brynet/net/Channel.h
@@ -1,22 +1,20 @@
 #pragma once
 
-namespace brynet
-{
-    namespace net
+namespace brynet { namespace net {
+
+    class EventLoop;
+
+    class Channel
     {
-        class EventLoop;
+    public:
+        virtual ~Channel() = default;
 
-        class Channel
-        {
-        public:
-            virtual ~Channel() = default;
+    private:
+        virtual void    canSend() = 0;
+        virtual void    canRecv() = 0;
+        virtual void    onClose() = 0;
 
-        private:
-            virtual void    canSend() = 0;
-            virtual void    canRecv() = 0;
-            virtual void    onClose() = 0;
+        friend class EventLoop;
+    };
 
-            friend class EventLoop;
-        };
-    }
-}
+} }