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/VirtualNetwork.h

diff --git a/server/VirtualNetwork.h b/server/VirtualNetwork.h
index 69b14d8..20c8dee 100644
--- a/server/VirtualNetwork.h
+++ b/server/VirtualNetwork.h
@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-#ifndef NETD_SERVER_VIRTUAL_NETWORK_H
-#define NETD_SERVER_VIRTUAL_NETWORK_H
+#pragma once
 
 #include <set>
 
 #include "Network.h"
 #include "UidRanges.h"
 
-namespace android {
-namespace net {
+namespace android::net {
 
 // A VirtualNetwork may be "secure" or not.
 //
@@ -40,15 +38,14 @@
     bool isSecure() const;
     bool appliesToUser(uid_t uid) const;
 
-    int addUsers(const UidRanges& uidRanges,
-                 const std::set<uid_t>& protectableUsers) WARN_UNUSED_RESULT;
-    int removeUsers(const UidRanges& uidRanges,
-                    const std::set<uid_t>& protectableUsers) WARN_UNUSED_RESULT;
+    [[nodiscard]] int addUsers(const UidRanges& uidRanges, const std::set<uid_t>& protectableUsers);
+    [[nodiscard]] int removeUsers(const UidRanges& uidRanges,
+                                  const std::set<uid_t>& protectableUsers);
 
-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 maybeCloseSockets(bool add, const UidRanges& uidRanges,
                           const std::set<uid_t>& protectableUsers);
 
@@ -56,7 +53,4 @@
     UidRanges mUidRanges;
 };
 
-}  // namespace net
-}  // namespace android
-
-#endif  // NETD_SERVER_VIRTUAL_NETWORK_H
+}  // namespace android::net