Richard Cooper has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/47761 )
Change subject: misc: Fix nesting of namespace{} and if-endif.
......................................................................
misc: Fix nesting of namespace{} and if-endif.
Fix a build error caused by the misaligned nesting of namespace{} and
if-endif. Previously, if HAVE_TUNTAP is not defined then the gem5
namespace is not closed.
Change-Id: I5e45d2271f97bb9e38c91565adb6aff0a7b43744
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47761
Reviewed-by: Nikos Nikoleris <nikos.nikole...@arm.com>
Reviewed-by: Bobby R. Bruce <bbr...@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbr...@ucdavis.edu>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/dev/net/ethertap.cc
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Nikos Nikoleris: Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/dev/net/ethertap.cc b/src/dev/net/ethertap.cc
index 979b03e..5b1e957 100644
--- a/src/dev/net/ethertap.cc
+++ b/src/dev/net/ethertap.cc
@@ -472,6 +472,6 @@
return true;
}
-} // namespace gem5
+#endif // HAVE_TUNTAP
-#endif
+} // namespace gem5
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47761
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I5e45d2271f97bb9e38c91565adb6aff0a7b43744
Gerrit-Change-Number: 47761
Gerrit-PatchSet: 2
Gerrit-Owner: Richard Cooper <richard.coo...@arm.com>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Nikos Nikoleris <nikos.nikole...@arm.com>
Gerrit-Reviewer: Richard Cooper <richard.coo...@arm.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
