diff options
| author | Yuriy Solodkyy <solodon4@users.noreply.github.com> | 2017-03-15 21:55:53 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-03-15 21:55:53 -0700 |
| commit | 67f40646d76d914ab7f099df25768c73c4f55bad (patch) | |
| tree | 95d4e098ac1cff10e5ed54a95f7952783c0c4e0d /src/vm/dwreport.cpp | |
| parent | 6a10391e57742487dd2458213d61c35f31139a4c (diff) | |
| download | coreclr-67f40646d76d914ab7f099df25768c73c4f55bad.tar.gz coreclr-67f40646d76d914ab7f099df25768c73c4f55bad.tar.bz2 coreclr-67f40646d76d914ab7f099df25768c73c4f55bad.zip | |
Minor fix to address ?: VC conformance improvement. (#10208)
Visual C++ has made some conformance changes to conditional operator
that will be available under /permissive- and which make the inference of
result type of the conditional operator in these 2 places ambiguous. This
happens because the class type in one of the arguments provides both: the
constructor from and the conversion operator to T - LCWSTR here.
Diffstat (limited to 'src/vm/dwreport.cpp')
| -rw-r--r-- | src/vm/dwreport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vm/dwreport.cpp b/src/vm/dwreport.cpp index 95d717231a..b95c59ff8d 100644 --- a/src/vm/dwreport.cpp +++ b/src/vm/dwreport.cpp @@ -2468,7 +2468,7 @@ FaultReportResult DoFaultReportWorker( // Was Watson attempted, successful? { // Look for final '\' pName = wcsrchr(buf, W('\\')); // If found, skip it; if not, point to full name. - pName = pName ? pName+1 : buf; + pName = pName ? pName+1 : (LPCWSTR)buf; } } |