Skip to content

Commit 3b16b38

Browse files
committed
Misc. little merge fixes for compiler
1 parent a5a7b6b commit 3b16b38

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

dmd/cppmanglewin.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ version (IN_LLVM)
5555
{
5656
// Return the mangled name of the RTTI Type Descriptor.
5757
// Reverse-engineered using a few C++ exception classes.
58-
scope VisualCPPMangler v = new VisualCPPMangler(false, s.loc, global.errorSink);
58+
scope VisualCPPMangler v = new VisualCPPMangler(s.loc, global.errorSink);
5959
v.buf.writestring("\1??_R0?AV");
6060
v.mangleIdent(s);
6161
v.buf.writestring("@8");

dmd/mars.d

+2-1
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ extern(C) void flushMixins()
475475
version (IN_LLVM)
476476
{
477477
import dmd.cli : Usage;
478+
import dmd.errors : deprecation, error;
478479

479480
private bool parseCLIOption(string groupName, Usage.Feature[] features)(ref Param params, const(char)* name)
480481
{
@@ -1918,7 +1919,7 @@ version (IN_LLVM) {} else
19181919
if (IN_LLVM && FileName.equals(ext, bc_ext))
19191920
{
19201921
global.params.bitcodeFiles.push(file);
1921-
return null;
1922+
return false;
19221923
}
19231924
if (FileName.equals(ext, target.lib_ext))
19241925
{

0 commit comments

Comments
 (0)