commit 58068654d542abfa5a01fe33ffe384acddd9639f
author Dave Smith <smithdave@google.com> Wed Jan 04 17:55:40 2023 +0000
committer Dave Smith <smithdave@google.com> Wed Jan 04 17:55:40 2023 +0000
tree 28888c60bdf4640020857c7592c10f91686893e3
parent f10f282771187d592dc7da5d0bc689f1b35e680c

[routing] Update outgoing directory add methods.

OutgoingDirectory.AddProtocol has changed. This updates the routing
sample usage to align with the updated method syntax.

Fixed: 118702
Change-Id: I64e63751d449a3957c9123da30832738f3eca96c
Reviewed-on: https://fuchsia-review.googlesource.com/c/sdk-samples/getting-started/+/785831
Reviewed-by: Chris Holguin <cholguin@google.com>

src/routing/cpp/echo_server/BUILD.bazel

diff --git a/src/routing/cpp/echo_server/BUILD.bazel b/src/routing/cpp/echo_server/BUILD.bazel
index ff40e83..f559bd1 100644
--- a/src/routing/cpp/echo_server/BUILD.bazel
+++ b/src/routing/cpp/echo_server/BUILD.bazel
@@ -26,7 +26,7 @@
         "@fuchsia_sdk//pkg/fdio",
         "@fuchsia_sdk//pkg/inspect",
         "@fuchsia_sdk//pkg/inspect_component_cpp",
-        "@fuchsia_sdk//pkg/sys_cpp",
+        "@fuchsia_sdk//pkg/sys_component_cpp",
         "@fuchsia_sdk//pkg/syslog",
     ],
 )

src/routing/cpp/echo_server/main.cc

diff --git a/src/routing/cpp/echo_server/main.cc b/src/routing/cpp/echo_server/main.cc
index 85c7600..5134378 100644
--- a/src/routing/cpp/echo_server/main.cc
+++ b/src/routing/cpp/echo_server/main.cc
@@ -8,7 +8,7 @@
 #include <lib/async-loop/default.h>
 #include <lib/fidl/cpp/binding.h>
 #include <lib/inspect/component/cpp/component.h>
-#include <lib/sys/cpp/outgoing_directory.h>
+#include <lib/sys/component/cpp/outgoing_directory.h>
 #include <lib/syslog/global.h>
 // [END imports]
 
@@ -50,7 +50,7 @@
 
   // Serve the Echo protocol
   std::unique_ptr<EchoImplementation> echo_instance = std::make_unique<EchoImplementation>();
-  zx::result result = outgoing.AddProtocol<examples_routing_echo::Echo>(std::move(echo_instance));
+  zx::result result = outgoing.AddProtocol<examples_routing_echo::Echo>(echo_instance.get());
   if (result.is_error()) {
     FX_LOGF(ERROR, "echo_server", "Failed to add Echo protocol: %s", result.status_string());
     return -1;

src/routing/cpp/inspect_server/BUILD.bazel

diff --git a/src/routing/cpp/inspect_server/BUILD.bazel b/src/routing/cpp/inspect_server/BUILD.bazel
index cfd48b4..d863306 100644
--- a/src/routing/cpp/inspect_server/BUILD.bazel
+++ b/src/routing/cpp/inspect_server/BUILD.bazel
@@ -8,7 +8,6 @@
     "fuchsia_cc_binary",
     "fuchsia_component",
     "fuchsia_component_manifest",
-    "fuchsia_package",
 )
 # [END imports]
 
@@ -27,7 +26,7 @@
         "@fuchsia_sdk//pkg/fdio",
         "@fuchsia_sdk//pkg/inspect",
         "@fuchsia_sdk//pkg/inspect_component_cpp",
-        "@fuchsia_sdk//pkg/sys_cpp",
+        "@fuchsia_sdk//pkg/sys_component_cpp",
         "@fuchsia_sdk//pkg/syslog",
     ],
 )

src/routing/cpp/inspect_server/main.cc

diff --git a/src/routing/cpp/inspect_server/main.cc b/src/routing/cpp/inspect_server/main.cc
index f3aec69..0707793 100644
--- a/src/routing/cpp/inspect_server/main.cc
+++ b/src/routing/cpp/inspect_server/main.cc
@@ -8,7 +8,7 @@
 #include <lib/async-loop/default.h>
 #include <lib/fidl/cpp/binding.h>
 #include <lib/inspect/component/cpp/component.h>
-#include <lib/sys/cpp/outgoing_directory.h>
+#include <lib/sys/component/cpp/outgoing_directory.h>
 #include <lib/syslog/global.h>
 // [END imports]
 
@@ -61,7 +61,7 @@
   // Serve the Echo protocol
   std::unique_ptr<EchoImplementation> echo_instance = std::make_unique<EchoImplementation>();
   // [END echo_instance]
-  zx::result result = outgoing.AddProtocol<examples_routing_echo::Echo>(std::move(echo_instance));
+  zx::result result = outgoing.AddProtocol<examples_routing_echo::Echo>(echo_instance.get());
   if (result.is_error()) {
     FX_LOGF(ERROR, "echo_server", "Failed to add Echo protocol: %s", result.status_string());
     return -1;