Skip to content

GitLab

Commit 4ee88457 authored by Davis King's avatar Davis King
Browse files

Fixed namespace lookup problem due to a name clash.

parent 893824a1
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
dlib/bridge/bridge.h
View file @ 4ee88457
...@@ -141,7 +141,7 @@ namespace dlib ...@@ -141,7 +141,7 @@ namespace dlib
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
namespace impl namespace impl_brns
{ {
class impl_bridge_base class impl_bridge_base
{ {
...@@ -594,26 +594,26 @@ namespace dlib ...@@ -594,26 +594,26 @@ namespace dlib
listen_on_port network_parameters, listen_on_port network_parameters,
bridge_transmit_decoration<T> transmit_pipe, bridge_transmit_decoration<T> transmit_pipe,
bridge_receive_decoration<R> receive_pipe bridge_receive_decoration<R> receive_pipe
) { pimpl.reset(); pimpl.reset(new impl::impl_bridge<T,R>(network_parameters.port, &transmit_pipe.p, &receive_pipe.p)); } ) { pimpl.reset(); pimpl.reset(new impl_brns::impl_bridge<T,R>(network_parameters.port, &transmit_pipe.p, &receive_pipe.p)); }
template < typename T, typename R > template < typename T, typename R >
void reconfigure ( void reconfigure (
listen_on_port network_parameters, listen_on_port network_parameters,
bridge_receive_decoration<R> receive_pipe, bridge_receive_decoration<R> receive_pipe,
bridge_transmit_decoration<T> transmit_pipe bridge_transmit_decoration<T> transmit_pipe
) { pimpl.reset(); pimpl.reset(new impl::impl_bridge<T,R>(network_parameters.port, &transmit_pipe.p, &receive_pipe.p)); } ) { pimpl.reset(); pimpl.reset(new impl_brns::impl_bridge<T,R>(network_parameters.port, &transmit_pipe.p, &receive_pipe.p)); }
template < typename T > template < typename T >
void reconfigure ( void reconfigure (
listen_on_port network_parameters, listen_on_port network_parameters,
bridge_transmit_decoration<T> transmit_pipe bridge_transmit_decoration<T> transmit_pipe
) { pimpl.reset(); pimpl.reset(new impl::impl_bridge<T,T>(network_parameters.port, &transmit_pipe.p, 0)); } ) { pimpl.reset(); pimpl.reset(new impl_brns::impl_bridge<T,T>(network_parameters.port, &transmit_pipe.p, 0)); }
template < typename R > template < typename R >
void reconfigure ( void reconfigure (
listen_on_port network_parameters, listen_on_port network_parameters,
bridge_receive_decoration<R> receive_pipe bridge_receive_decoration<R> receive_pipe
) { pimpl.reset(); pimpl.reset(new impl::impl_bridge<R,R>(network_parameters.port, 0, &receive_pipe.p)); } ) { pimpl.reset(); pimpl.reset(new impl_brns::impl_bridge<R,R>(network_parameters.port, 0, &receive_pipe.p)); }
...@@ -623,26 +623,26 @@ namespace dlib ...@@ -623,26 +623,26 @@ namespace dlib
connect_to_ip_and_port network_parameters, connect_to_ip_and_port network_parameters,
bridge_transmit_decoration<T> transmit_pipe, bridge_transmit_decoration<T> transmit_pipe,
bridge_receive_decoration<R> receive_pipe bridge_receive_decoration<R> receive_pipe
) { pimpl.reset(); pimpl.reset(new impl::impl_bridge<T,R>(network_parameters.ip, network_parameters.port, &transmit_pipe.p, &receive_pipe.p)); } ) { pimpl.reset(); pimpl.reset(new impl_brns::impl_bridge<T,R>(network_parameters.ip, network_parameters.port, &transmit_pipe.p, &receive_pipe.p)); }
template < typename T, typename R > template < typename T, typename R >
void reconfigure ( void reconfigure (
connect_to_ip_and_port network_parameters, connect_to_ip_and_port network_parameters,
bridge_receive_decoration<R> receive_pipe, bridge_receive_decoration<R> receive_pipe,
bridge_transmit_decoration<T> transmit_pipe bridge_transmit_decoration<T> transmit_pipe
) { pimpl.reset(); pimpl.reset(new impl::impl_bridge<T,R>(network_parameters.ip, network_parameters.port, &transmit_pipe.p, &receive_pipe.p)); } ) { pimpl.reset(); pimpl.reset(new impl_brns::impl_bridge<T,R>(network_parameters.ip, network_parameters.port, &transmit_pipe.p, &receive_pipe.p)); }
template < typename R > template < typename R >
void reconfigure ( void reconfigure (
connect_to_ip_and_port network_parameters, connect_to_ip_and_port network_parameters,
bridge_receive_decoration<R> receive_pipe bridge_receive_decoration<R> receive_pipe
) { pimpl.reset(); pimpl.reset(new impl::impl_bridge<R,R>(network_parameters.ip, network_parameters.port, 0, &receive_pipe.p)); } ) { pimpl.reset(); pimpl.reset(new impl_brns::impl_bridge<R,R>(network_parameters.ip, network_parameters.port, 0, &receive_pipe.p)); }
template < typename T > template < typename T >
void reconfigure ( void reconfigure (
connect_to_ip_and_port network_parameters, connect_to_ip_and_port network_parameters,
bridge_transmit_decoration<T> transmit_pipe bridge_transmit_decoration<T> transmit_pipe
) { pimpl.reset(); pimpl.reset(new impl::impl_bridge<T,T>(network_parameters.ip, network_parameters.port, &transmit_pipe.p, 0)); } ) { pimpl.reset(); pimpl.reset(new impl_brns::impl_bridge<T,T>(network_parameters.ip, network_parameters.port, &transmit_pipe.p, 0)); }
bridge_status get_bridge_status ( bridge_status get_bridge_status (
...@@ -656,7 +656,7 @@ namespace dlib ...@@ -656,7 +656,7 @@ namespace dlib
private: private:
scoped_ptr<impl::impl_bridge_base> pimpl; scoped_ptr<impl_brns::impl_bridge_base> pimpl;
}; };
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment