From 157f23be5c115a1cb6c16d797f6f3ea86029b687 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Mon, 26 Mar 2012 12:42:05 +0400 Subject: [PATCH] Fix warnings. --- library/DataDefs.cpp | 3 +++ library/include/RemoteTools.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/library/DataDefs.cpp b/library/DataDefs.cpp index 755477d47..cf8a32fcc 100644 --- a/library/DataDefs.cpp +++ b/library/DataDefs.cpp @@ -65,7 +65,10 @@ void *type_identity::allocate() { bool type_identity::copy(void *tgt, const void *src) { if (can_allocate() && tgt && src) + { do_copy(tgt, src); + return true; + } else return false; } diff --git a/library/include/RemoteTools.h b/library/include/RemoteTools.h index ea0937784..bccbb5e62 100644 --- a/library/include/RemoteTools.h +++ b/library/include/RemoteTools.h @@ -40,7 +40,7 @@ namespace df namespace DFHack { - class MaterialInfo; + struct MaterialInfo; using google::protobuf::RepeatedField; using google::protobuf::RepeatedPtrField;