Merge branch 'master' into jgrpp
# Conflicts: # source.list # src/blitter/32bpp_anim.cpp # src/linkgraph/linkgraphjob.cpp # src/order_cmd.cpp # src/vehicle.cpp # src/vehicle_type.h
This commit is contained in:
@@ -91,15 +91,6 @@ public:
|
||||
this->SetPort(port);
|
||||
}
|
||||
|
||||
/**
|
||||
* Make a clone of another address
|
||||
* @param address the address to clone
|
||||
*/
|
||||
NetworkAddress(const NetworkAddress &address)
|
||||
{
|
||||
memcpy(this, &address, sizeof(*this));
|
||||
}
|
||||
|
||||
const char *GetHostname();
|
||||
void GetAddressAsString(char *buffer, const char *last, bool with_family = true);
|
||||
const char *GetAddressAsString(bool with_family = true);
|
||||
|
Reference in New Issue
Block a user