Browse Source

Fix typo and erroneous move ctor

manuel5975p 6 years ago
parent
commit
83d0b4524e
2 changed files with 4 additions and 36 deletions
  1. 1 0
      socketio_posix.cpp
  2. 3 36
      socketio_win32.cpp

+ 1 - 0
socketio_posix.cpp

@@ -143,4 +143,5 @@ cppsocket& cppsocket::operator=(cppsocket&& o){
 	sock = o.sock;
 	o.sock = 0;
 	buffer = std::move(o.buffer);
+	return *this;
 }

+ 3 - 36
socketio_win32.cpp

@@ -177,40 +177,7 @@ void server_socket::close(){
 }
 cppsocket& cppsocket::operator=(cppsocket&& o){
 	s = o.s;
-	o.sock = INVALID_SOCKET;
+	o.s = INVALID_SOCKET;
 	buffer = std::move(o.buffer);
-}
-/*int main(int argc, char** argv){
-	server_socket ssock(80);
-	while(true){
-		cppsocket sock = ssock.accept_connection();
-		sock.write("ab");
-		std::vector<char> rec = sock.receive();
-		std::cout << rec << ", ";
-		std::cout << rec << std::endl;
-		sock.close();
-	}
-	ssock.close();
-	
-	//Send some data
-	std::string _message = std::string("Hallo");
-	memcpy(message, _message.c_str(), _message.length() + 1);
-	if( send(s , message , strlen(message) , 0) < 0){
-		puts("Send failed");
-		return 1;
-	}
-	puts("Data Send\n");
-	
-	//Receive a reply from the server
-	if((recv_size = recv(s , server_reply , 2000 , 0)) == SOCKET_ERROR){
-		puts("recv failed");
-	}
-	
-	puts("Reply received\n");
-	
-	//Add a NULL terminating character to make it a proper string before printing
-	server_reply[recv_size] = '\0';
-	puts(server_reply);
-	
-	return 0;
-}*/
+	return *this;
+}