Fixed the linux build, added C++14 flag for std::make_unique

master
MitchellHansen 8 years ago
parent fa047f9e3a
commit 88e69721e1

@ -69,5 +69,5 @@ endif()
#target_link_libraries (${PNAME} ${Vulkan_LIBRARIES}) #target_link_libraries (${PNAME} ${Vulkan_LIBRARIES})
# Setup to use C++11 # Setup to use C++11
set_property(TARGET ${PNAME} PROPERTY CXX_STANDARD 11) # Use C++11 set_property(TARGET ${PNAME} PROPERTY CXX_STANDARD 14) # Use C++11

@ -1,5 +1,7 @@
#include "NetworkInput.h" #include "NetworkInput.h"
#include <iostream> #include <iostream>
#include <cstring>
#include <memory>
NetworkInput::NetworkInput() { NetworkInput::NetworkInput() {
@ -119,7 +121,7 @@ void NetworkInput::threaded_client_listener(int port) {
int position = 0; int position = 0;
while (position < received) { while (position < received) {
CustomPacket p; CustomPacket p;
memcpy(p.data, &buffer[position], p.size); std::memcpy(p.data, &buffer[position], p.size);
packets.push_back(p); packets.push_back(p);
position += p.size; position += p.size;
} }
@ -127,7 +129,7 @@ void NetworkInput::threaded_client_listener(int port) {
std::cout << "packet_count = " << packets.size() << std::endl; std::cout << "packet_count = " << packets.size() << std::endl;
int left_over = 12 - (position - received); int left_over = 12 - (position - received);
memcpy(buffer, &buffer[received - left_over], left_over); std::memcpy(buffer, &buffer[received - left_over], left_over);
} while (status != sf::TcpSocket::Status::Done); } while (status != sf::TcpSocket::Status::Done);

Loading…
Cancel
Save