Merge pull request #2259

569b9b2b updates: add "misc_log_ex.h" for logs (moneromooo-monero)
74628941 dns_utils: add <functional> for std::function (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-08-07 16:01:22 +02:00
commit 9fc78023e2
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 2 additions and 0 deletions

View file

@ -29,6 +29,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <functional>
namespace tools namespace tools
{ {

View file

@ -26,6 +26,7 @@
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "misc_log_ex.h"
#include "util.h" #include "util.h"
#include "dns_utils.h" #include "dns_utils.h"
#include "updates.h" #include "updates.h"