commit 762dcf48a2fef596d677d9e8d6ec655d58303211
author Bernie Innocenti <codewiz@google.com> Fri Jun 14 19:52:49 2019 +0900
committer Bernie Innocenti <codewiz@google.com> Wed Aug 21 15:59:41 2019 +0900
tree 60beab7ae8e436cbd080f6492ca36739040f666f
parent cf6f710b67a8a5f35d47b2b20fee61395f79236d

Use C++17's [[nodiscard]] instead of WARN_UNUSED_RESULT

No functionality change. Also remove some header guards along the way.

Test: m
Change-Id: I1afdcaea95a3dd56f392c4e61d7670f43615792a

server/PhysicalNetwork.h

diff --git a/server/PhysicalNetwork.h b/server/PhysicalNetwork.h
index 89c9443..0720824 100644
--- a/server/PhysicalNetwork.h
+++ b/server/PhysicalNetwork.h
@@ -14,25 +14,23 @@
  * limitations under the License.
  */
 
-#ifndef NETD_SERVER_PHYSICAL_NETWORK_H
-#define NETD_SERVER_PHYSICAL_NETWORK_H
+#pragma once
 
 #include "Network.h"
 #include "Permission.h"
 
-namespace android {
-namespace net {
+namespace android::net {
 
 class PhysicalNetwork : public Network {
-public:
+  public:
     class Delegate {
-    public:
+      public:
         virtual ~Delegate();
 
-        virtual int addFallthrough(const std::string& physicalInterface,
-                                   Permission permission) WARN_UNUSED_RESULT = 0;
-        virtual int removeFallthrough(const std::string& physicalInterface,
-                                      Permission permission) WARN_UNUSED_RESULT = 0;
+        [[nodiscard]] virtual int addFallthrough(const std::string& physicalInterface,
+                                                 Permission permission) = 0;
+        [[nodiscard]] virtual int removeFallthrough(const std::string& physicalInterface,
+                                                    Permission permission) = 0;
     };
 
     PhysicalNetwork(unsigned netId, Delegate* delegate);
@@ -40,15 +38,15 @@
 
     // These refer to permissions that apps must have in order to use this network.
     Permission getPermission() const;
-    int setPermission(Permission permission) WARN_UNUSED_RESULT;
+    [[nodiscard]] int setPermission(Permission permission);
 
-    int addAsDefault() WARN_UNUSED_RESULT;
-    int removeAsDefault() WARN_UNUSED_RESULT;
+    [[nodiscard]] int addAsDefault();
+    [[nodiscard]] int removeAsDefault();
 
-private:
+  private:
     Type getType() const override;
-    int addInterface(const std::string& interface) override WARN_UNUSED_RESULT;
-    int removeInterface(const std::string& interface) override WARN_UNUSED_RESULT;
+    [[nodiscard]] int addInterface(const std::string& interface) override;
+    [[nodiscard]] int removeInterface(const std::string& interface) override;
     int destroySocketsLackingPermission(Permission permission);
     void invalidateRouteCache(const std::string& interface);
 
@@ -57,7 +55,4 @@
     bool mIsDefault;
 };
 
-}  // namespace net
-}  // namespace android
-
-#endif  // NETD_SERVER_PHYSICAL_NETWORK_H
+}  // namespace android::net