From 1007cb5f49c0ac2bc522723beb4d6dac6959b20e Mon Sep 17 00:00:00 2001 From: Victor Cebollada Date: Mon, 22 Jun 2020 15:01:28 +0100 Subject: [PATCH] Fix MS Windows compile error. * _Hash_bytes() function added for the Win32 implementation. Change-Id: I779a493805e8e1a083c7f3d92c1cbf6a3d13d7ed Signed-off-by: Victor Cebollada (cherry picked from commit 98db2b4264b3d62524d330698c3e611da94cb3dd) --- dali/internal/event/common/property-buffer-impl.cpp | 2 +- dali/internal/event/common/property-input-impl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dali/internal/event/common/property-buffer-impl.cpp b/dali/internal/event/common/property-buffer-impl.cpp index 242aa67..30688d2 100644 --- a/dali/internal/event/common/property-buffer-impl.cpp +++ b/dali/internal/event/common/property-buffer-impl.cpp @@ -22,7 +22,7 @@ #include #include -#ifdef ANDROID +#if defined (ANDROID) || defined(WIN32) namespace std { uint64_t _Hash_bytes(const void* bytes, uint64_t size, uint64_t seed) diff --git a/dali/internal/event/common/property-input-impl.h b/dali/internal/event/common/property-input-impl.h index 297332f..bd8d4ec 100644 --- a/dali/internal/event/common/property-input-impl.h +++ b/dali/internal/event/common/property-input-impl.h @@ -31,7 +31,7 @@ #include #include -#ifdef ANDROID +#if defined (ANDROID) || defined(WIN32) namespace std { -- 2.7.4