Swift
summaryrefslogtreecommitdiffstats
path: root/Sluift
diff options
context:
space:
mode:
Diffstat (limited to 'Sluift')
-rw-r--r--Sluift/SluiftClient.h1
-rw-r--r--Sluift/SluiftComponent.cpp2
-rw-r--r--Sluift/SluiftComponent.h2
-rw-r--r--Sluift/component.cpp4
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
@@ -81,7 +81,6 @@ namespace Swift {
81 } 81 }
82 82
83 void connect(); 83 void connect();
84 void connect(const std::string& host, int port);
85 void waitConnected(int timeout); 84 void waitConnected(int timeout);
86 bool isConnected() const; 85 bool isConnected() const;
87 void setTraceEnabled(bool b); 86 void setTraceEnabled(bool b);
diff --git a/Sluift/SluiftComponent.cpp b/Sluift/SluiftComponent.cpp
index ee09380..74728ee 100644
--- a/Sluift/SluiftComponent.cpp
+++ b/Sluift/SluiftComponent.cpp
@@ -40,7 +40,7 @@ SluiftComponent::~SluiftComponent() {
40 delete component; 40 delete component;
41} 41}
42 42
43void SluiftComponent::connect(const std::string& host, int port) { 43void SluiftComponent::connect(const std::string& host, unsigned short port) {
44 if (component->isActive()) { 44 if (component->isActive()) {
45 throw Lua::Exception("Component is already connecting or connected"); 45 throw Lua::Exception("Component is already connecting or connected");
46 } 46 }
diff --git a/Sluift/SluiftComponent.h b/Sluift/SluiftComponent.h
index 9fc7101..586a94e 100644
--- a/Sluift/SluiftComponent.h
+++ b/Sluift/SluiftComponent.h
@@ -63,7 +63,7 @@ namespace Swift {
63 return component; 63 return component;
64 } 64 }
65 65
66 void connect(const std::string& host, int port); 66 void connect(const std::string& host, unsigned short port);
67 void waitConnected(int timeout); 67 void waitConnected(int timeout);
68 bool isConnected() const; 68 bool isConnected() const;
69 void setTraceEnabled(bool b); 69 void setTraceEnabled(bool b);
diff --git a/Sluift/component.cpp b/Sluift/component.cpp
index f3c2e37..c1b1da4 100644
--- a/Sluift/component.cpp
+++ b/Sluift/component.cpp
@@ -96,13 +96,13 @@ SLUIFT_LUA_FUNCTION(Component, async_connect) {
96 SluiftComponent* component = getComponent(L); 96 SluiftComponent* component = getComponent(L);
97 97
98 std::string host; 98 std::string host;
99 int port = 0; 99 unsigned short port = 0;
100 if (lua_istable(L, 2)) { 100 if (lua_istable(L, 2)) {
101 if (boost::optional<std::string> hostString = Lua::getStringField(L, 2, "host")) { 101 if (boost::optional<std::string> hostString = Lua::getStringField(L, 2, "host")) {
102 host = *hostString; 102 host = *hostString;
103 } 103 }
104 if (boost::optional<int> portInt = Lua::getIntField(L, 2, "port")) { 104 if (boost::optional<int> portInt = Lua::getIntField(L, 2, "port")) {
105 port = *portInt; 105 port = boost::numeric_cast<unsigned short>(*portInt);
106 } 106 }
107 } 107 }
108 component->connect(host, port); 108 component->connect(host, port);