Moved FrameChannelMapping attrs getter to the proper namespace.

us4useu · Mar 9, 2022 · c34b021 · c34b021
1 parent 79c9515
commit c34b021
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/arrus/core/devices/us4r/FrameChannelMappingImpl.h b/arrus/core/devices/us4r/FrameChannelMappingImpl.h
@@ -13,7 +13,8 @@
 // Make the FrameChannelMappingAddress available for structure binding
 namespace std {
 
-template<> struct tuple_size<::arrus::devices::FrameChannelMappingAddress>: integral_constant<size_t, 3> {};
+template<>
+struct tuple_size<::arrus::devices::FrameChannelMappingAddress> : integral_constant<size_t, 3> {};
 
 template<>
 struct tuple_element<0, ::arrus::devices::FrameChannelMappingAddress> {
@@ -29,7 +30,9 @@ template<>
 struct tuple_element<2, ::arrus::devices::FrameChannelMappingAddress> {
     using type = int8_t;
 };
+}
 
+namespace arrus::devices {
 template<std::size_t Index>
 std::tuple_element_t<Index, ::arrus::devices::FrameChannelMappingAddress> get(
     const ::arrus::devices::FrameChannelMappingAddress& address)

diff --git a/arrus/core/devices/us4r/probeadapter/ProbeAdapterImpl.cpp b/arrus/core/devices/us4r/probeadapter/ProbeAdapterImpl.cpp
@@ -244,9 +244,9 @@ ProbeAdapterImpl::setTxRxSequence(const std::vector<TxRxParameters> &seq, const
                     int8 dstFrameChannel = -1;
                     if(!FrameChannelMapping::isChannelUnavailable(dstChannel)) {
                         auto res = fcMappings[dstModule]->getLogical(dstOp, dstChannel);
-                        us4oem = std::get<0>(res);
-                        dstFrame = std::get<1>(res);
-                        dstFrameChannel = std::get<2>(res);
+                        us4oem = arrus::devices::get<0>(res);
+                        dstFrame = arrus::devices::get<1>(res);
+                        dstFrameChannel = arrus::devices::get<2>(res);
                     }
                     outFcBuilder.setChannelMapping(frameIdx, activeRxChIdx + op.getRxPadding()[0],
                                                    us4oem, dstFrame, dstFrameChannel);