diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-02-10 07:35:53 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-10 07:35:53 +0300 |
| commit | e2f6e255fb6ec5649b550e1406c5d3bc6b1cb0cd (patch) | |
| tree | 49739e956294a999a4dc428c828f3f900eca196f /src/Native/Runtime/Profiling.cpp | |
| parent | 2c057e7ab0ad2ab1ff476094674a303a082960b9 (diff) | |
| parent | b685eb96c45513036a11d53644cd17c80fdc7710 (diff) | |
Merge remote-tracking branch 'upstream/nmirror' into nmirror-merge
Conflicts:
src/Native/Runtime/CachedInterfaceDispatch.cpp
Diffstat (limited to 'src/Native/Runtime/Profiling.cpp')
| -rw-r--r-- | src/Native/Runtime/Profiling.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Native/Runtime/Profiling.cpp b/src/Native/Runtime/Profiling.cpp index 9de2e1e58..197523778 100644 --- a/src/Native/Runtime/Profiling.cpp +++ b/src/Native/Runtime/Profiling.cpp @@ -15,6 +15,7 @@ #include "RWLock.h" #include "RuntimeInstance.h" #include "gcrhinterface.h" +#include "shash.h" #include "module.h" // Macro nonsense to get around limitations of the C++ preprocessor. |