diff options
Diffstat (limited to 'Sluift')
| -rw-r--r-- | Sluift/SluiftClient.h | 1 | ||||
| -rw-r--r-- | Sluift/SluiftComponent.cpp | 2 | ||||
| -rw-r--r-- | Sluift/SluiftComponent.h | 2 | ||||
| -rw-r--r-- | Sluift/component.cpp | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/Sluift/SluiftClient.h b/Sluift/SluiftClient.h index 8cc815d..39ff0a8 100644 --- a/Sluift/SluiftClient.h +++ b/Sluift/SluiftClient.h @@ -79,11 +79,10 @@ namespace Swift { ClientOptions& getOptions() { return options; } void connect(); - void connect(const std::string& host, int port); void waitConnected(int timeout); bool isConnected() const; void setTraceEnabled(bool b); template<typename T> diff --git a/Sluift/SluiftComponent.cpp b/Sluift/SluiftComponent.cpp index ee09380..74728ee 100644 --- a/Sluift/SluiftComponent.cpp +++ b/Sluift/SluiftComponent.cpp @@ -38,11 +38,11 @@ SluiftComponent::SluiftComponent( SluiftComponent::~SluiftComponent() { delete tracer; delete component; } -void SluiftComponent::connect(const std::string& host, int port) { +void SluiftComponent::connect(const std::string& host, unsigned short port) { if (component->isActive()) { throw Lua::Exception("Component is already connecting or connected"); } disconnectedError = boost::optional<ComponentError>(); component->connect(host, port); diff --git a/Sluift/SluiftComponent.h b/Sluift/SluiftComponent.h index 9fc7101..586a94e 100644 --- a/Sluift/SluiftComponent.h +++ b/Sluift/SluiftComponent.h @@ -61,11 +61,11 @@ namespace Swift { Component* getComponent() { return component; } - void connect(const std::string& host, int port); + void connect(const std::string& host, unsigned short port); void waitConnected(int timeout); bool isConnected() const; void setTraceEnabled(bool b); template<typename REQUEST_TYPE> diff --git a/Sluift/component.cpp b/Sluift/component.cpp index f3c2e37..c1b1da4 100644 --- a/Sluift/component.cpp +++ b/Sluift/component.cpp @@ -94,17 +94,17 @@ static std::vector< std::shared_ptr<Payload> > getPayloadsFromTable(lua_State* L SLUIFT_LUA_FUNCTION(Component, async_connect) { SluiftComponent* component = getComponent(L); std::string host; - int port = 0; + unsigned short port = 0; if (lua_istable(L, 2)) { if (boost::optional<std::string> hostString = Lua::getStringField(L, 2, "host")) { host = *hostString; } if (boost::optional<int> portInt = Lua::getIntField(L, 2, "port")) { - port = *portInt; + port = boost::numeric_cast<unsigned short>(*portInt); } } component->connect(host, port); return 0; } |
Swift