Skip to content

Commit 4af30c6

Browse files
author
Taiju Yamada
committed
Some changes for building
1 parent 14a5f61 commit 4af30c6

File tree

4 files changed

+3
-2
lines changed

4 files changed

+3
-2
lines changed

include/mujincontrollerclient/mujincontrollerclient.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#ifdef _MSC_VER
2222

23+
#define NOMINMAX
2324
#pragma warning(disable:4251)// needs to have dll-interface to be used by clients of class
2425
#pragma warning(disable:4190)// C-linkage specified, but returns UDT 'boost::shared_ptr<T>' which is incompatible with C
2526
#pragma warning(disable:4819)//The file contains a character that cannot be represented in the current code page (932). Save the file in Unicode format to prevent data loss using native typeof

src/common.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include <curl/curl.h>
3636

3737
#if defined(_WIN32) || defined(_WIN64)
38+
#define NOMINMAX
3839
#include <windows.h>
3940
#undef GetUserName // classes with ControllerClient::GetUserName
4041

src/controllerclientimpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2289,7 +2289,7 @@ GraphSubscriptionWebSocketHandler::GraphSubscriptionWebSocketHandler(const Contr
22892289
MUJIN_LOG_INFO(boost::format("Create TCP socket connected to host %s") % host);
22902290

22912291
boost::asio::ip::tcp::socket socket(*ioContext);
2292-
boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::address::from_string(host), port);
2292+
boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::make_address(host), port);
22932293
socket.connect(endpoint);
22942294
_tcpStream = boost::make_shared<boost::beast::websocket::stream<boost::asio::ip::tcp::socket>>(std::move(socket));
22952295
} else {

src/mujincontrollerclient.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "controllerclientimpl.h"
1616
#include <boost/thread.hpp> // for sleep
1717
#include <boost/algorithm/string.hpp>
18-
#include <netdb.h>
1918
#include <arpa/inet.h>
2019

2120
#include <mujincontrollerclient/binpickingtask.h>

0 commit comments

Comments
 (0)