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

diff --git a/server/Network.h b/server/Network.h
index 69af3ff..8417f34 100644
--- a/server/Network.h
+++ b/server/Network.h
@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-#ifndef NETD_SERVER_NETWORK_H
-#define NETD_SERVER_NETWORK_H
+#pragma once
 
 #include "NetdConstants.h"
 
 #include <set>
 #include <string>
 
-namespace android {
-namespace net {
+namespace android::net {
 
 // A Network represents a collection of interfaces participating as a single administrative unit.
 class Network {
@@ -47,9 +45,9 @@
     const std::set<std::string>& getInterfaces() const;
 
     // These return 0 on success or negative errno on failure.
-    virtual int addInterface(const std::string& interface) WARN_UNUSED_RESULT = 0;
-    virtual int removeInterface(const std::string& interface) WARN_UNUSED_RESULT = 0;
-    int clearInterfaces() WARN_UNUSED_RESULT;
+    [[nodiscard]] virtual int addInterface(const std::string& interface) = 0;
+    [[nodiscard]] virtual int removeInterface(const std::string& interface) = 0;
+    [[nodiscard]] int clearInterfaces();
 
     std::string toString() const;
 
@@ -60,7 +58,4 @@
     std::set<std::string> mInterfaces;
 };
 
-}  // namespace net
-}  // namespace android
-
-#endif  // NETD_SERVER_NETWORK_H
+}  // namespace android::net