mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-16 07:19:07 +08:00
40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
|
RobotRaconteurCore/src/LocalTransport.cpp | 2 +-
|
||
|
|
RobotRaconteurCore/src/TcpTransport.cpp | 4 ++--
|
||
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/RobotRaconteurCore/src/LocalTransport.cpp b/RobotRaconteurCore/src/LocalTransport.cpp
|
||
|
|
index c297a3d..4c55446 100644
|
||
|
|
--- a/RobotRaconteurCore/src/LocalTransport.cpp
|
||
|
|
+++ b/RobotRaconteurCore/src/LocalTransport.cpp
|
||
|
|
@@ -1879,7 +1879,7 @@ void FindNodesInDirectory(std::vector<NodeDiscoveryInfo>& nodeinfo, const boost:
|
||
|
|
|
||
|
|
NodeID nodeid(nodeid1->second);
|
||
|
|
|
||
|
|
- if (nodename1->second != boost::filesystem::change_extension(dir_itr->path().filename(), ""))
|
||
|
|
+ if (nodename1->second != dir_itr->path().filename().replace_extension(""))
|
||
|
|
{
|
||
|
|
// TODO: Test?
|
||
|
|
continue;
|
||
|
|
diff --git a/RobotRaconteurCore/src/TcpTransport.cpp b/RobotRaconteurCore/src/TcpTransport.cpp
|
||
|
|
index 551b3a5..7d348f2 100644
|
||
|
|
--- a/RobotRaconteurCore/src/TcpTransport.cpp
|
||
|
|
+++ b/RobotRaconteurCore/src/TcpTransport.cpp
|
||
|
|
@@ -6634,7 +6634,7 @@ void TcpTransportPortSharerClient::client_thread()
|
||
|
|
p1 /= "tcp";
|
||
|
|
p1 /= "portsharer";
|
||
|
|
p1 /= "portsharer.info";
|
||
|
|
- p1.normalize();
|
||
|
|
+ p1.lexically_normal();
|
||
|
|
|
||
|
|
ROBOTRACONTEUR_LOG_TRACE_COMPONENT(node, Transport, -1, "Looking for portsharer.info in " << p1);
|
||
|
|
|
||
|
|
@@ -6658,7 +6658,7 @@ void TcpTransportPortSharerClient::client_thread()
|
||
|
|
p1 /= "tcp";
|
||
|
|
p1 /= "portsharer";
|
||
|
|
p1 /= "portsharer.info";
|
||
|
|
- p1.normalize();
|
||
|
|
+ p1.lexically_normal();
|
||
|
|
|
||
|
|
ROBOTRACONTEUR_LOG_TRACE_COMPONENT(node, Transport, -1, "Looking for portsharer.info in " << p1);
|
||
|
|
|