diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-21 12:11:03 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-21 12:11:03 +0200 |
| commit | 5061def42242ed424cfc96166095762811dc1c5f (patch) | |
| tree | 6f36a7ed2b8a8aaeafe06322d5b0dc93a9556970 /src/server/shared | |
| parent | e5e52406bd8d764e8f13a10279f197d262121c25 (diff) | |
| parent | 793c56b8b7dd7b90d8e3405449522849c2be8046 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
Diffstat (limited to 'src/server/shared')
| -rw-r--r-- | src/server/shared/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/server/shared/Define.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index a61248f01ea..7a02e415d69 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -77,6 +77,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object ${MYSQL_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} + ${VALGRIND_INCLUDE_DIR} ) add_library(shared STATIC diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index 5d5da7e600e..2723d287c53 100644 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -31,6 +31,11 @@ # if !defined(_GLIBCXX_USE_NANOSLEEP) # define _GLIBCXX_USE_NANOSLEEP # endif +# if defined(HELGRIND) +# include <valgrind/helgrind.h> +# define _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(A) ANNOTATE_HAPPENS_BEFORE(A) +# define _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(A) ANNOTATE_HAPPENS_AFTER(A) +# endif #endif #include <cstddef> |