diff options
| author | Aditya Mandaleeka <adityamandaleeka@users.noreply.github.com> | 2016-01-25 17:03:30 -0800 |
|---|---|---|
| committer | Aditya Mandaleeka <adityamandaleeka@users.noreply.github.com> | 2016-01-25 17:03:30 -0800 |
| commit | c7eabd346b5f6ffe329600bddbf9525ee96f112b (patch) | |
| tree | 5b0af468574da1391509c1ab49e18ceccba20d33 /src/vm | |
| parent | fc91cedf6393e17cc18a4695a9fe70b73c16c51f (diff) | |
| parent | 5c5ede31df493b3d620219d5cb6bbb339245a918 (diff) | |
| download | coreclr-c7eabd346b5f6ffe329600bddbf9525ee96f112b.tar.gz coreclr-c7eabd346b5f6ffe329600bddbf9525ee96f112b.tar.bz2 coreclr-c7eabd346b5f6ffe329600bddbf9525ee96f112b.zip | |
Merge pull request #2855 from adityamandaleeka/fixDasmAssert
Move assert under COREDISTOOLS ifdef.
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/disassembler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vm/disassembler.cpp b/src/vm/disassembler.cpp index a65410a1b7..f7830b4898 100644 --- a/src/vm/disassembler.cpp +++ b/src/vm/disassembler.cpp @@ -75,9 +75,10 @@ bool Disassembler::IsAvailable() void Disassembler::StaticInitialize() { LIMITED_METHOD_CONTRACT; - _ASSERTE(!IsAvailable()); #if USE_COREDISTOOLS_DISASSEMBLER + _ASSERTE(!IsAvailable()); + // TODO: The 'coredistools' library will eventually be part of a NuGet package, need to be able to load // that using appropriate search paths LPCWSTR libraryName = MAKEDLLNAME(W("coredistools")); |