Permalink
Browse files

Windows Buildfix

  • Loading branch information...
Kingcom committed Jun 24, 2018
1 parent bb06fb0 commit 440465fac0770a472580a6ae8ef0eb703d890d36
@@ -62,7 +62,7 @@ std::wstring preprocessMacro(const wchar_t* text, MipsImmediateData& immediates)
std::unique_ptr<CAssemblerCommand> createMacro(Parser& parser, const std::wstring& text, int flags, std::initializer_list<AssemblyTemplateArgument> variables)
{
std::unique_ptr<CAssemblerCommand> content = parser.parseTemplate(text,variables);
return make_unique<MipsMacroCommand>(std::move(content),flags);
return ::make_unique<MipsMacroCommand>(std::move(content),flags);
}
std::unique_ptr<CAssemblerCommand> generateMipsMacroAbs(Parser& parser, MipsRegisterData& registers, MipsImmediateData& immediates, int flags)
@@ -151,9 +151,9 @@ std::unique_ptr<CAssemblerCommand> parseDirectiveLoadElf(Parser& parser, int fla
{
if (list[1].evaluateString(outputName,true) == false)
return nullptr;
return make_unique<DirectiveLoadMipsElf>(inputName,outputName);
return ::make_unique<DirectiveLoadMipsElf>(inputName,outputName);
} else {
return make_unique<DirectiveLoadMipsElf>(inputName);
return ::make_unique<DirectiveLoadMipsElf>(inputName);
}
}
@@ -181,13 +181,13 @@ std::unique_ptr<CAssemblerCommand> parseDirectiveImportObj(Parser& parser, int f
return make_unique<InvalidCommand>();
}
return make_unique<DirectiveObjImport>(inputName,ctorName);
return ::make_unique<DirectiveObjImport>(inputName,ctorName);
}
if (Mips.GetVersion() == MARCH_PSX)
return make_unique<DirectivePsxObjImport>(inputName);
return ::make_unique<DirectivePsxObjImport>(inputName);
else
return make_unique<DirectiveObjImport>(inputName);
return ::make_unique<DirectiveObjImport>(inputName);
}
const DirectiveMap mipsDirectives = {
@@ -102,7 +102,7 @@ void CAssemblerLabel::writeSymData(SymbolData& symData) const
CDirectiveFunction::CDirectiveFunction(const std::wstring& name, const std::wstring& originalName)
{
this->label = make_unique<CAssemblerLabel>(name,originalName);
this->label = ::make_unique<CAssemblerLabel>(name,originalName);
this->content = nullptr;
this->start = this->end = 0;
}
@@ -268,7 +268,7 @@ std::unique_ptr<CAssemblerCommand> ElfRelocator::generateCtor(const std::wstring
{
std::unique_ptr<CAssemblerCommand> content = relocator->generateCtorStub(ctors);
auto func = make_unique<CDirectiveFunction>(ctorName,ctorName);
auto func = ::make_unique<CDirectiveFunction>(ctorName,ctorName);
func->setContent(std::move(content));
return func;
}
@@ -85,7 +85,7 @@ std::unique_ptr<CAssemblerCommand> parseDirectiveIncbin(Parser& parser, int flag
if (list[0].evaluateString(fileName,false) == false)
return nullptr;
auto incbin = make_unique<CDirectiveIncbin>(fileName);
auto incbin = ::make_unique<CDirectiveIncbin>(fileName);
if (list.size() >= 2)
incbin->setStart(list[1]);
@@ -179,10 +179,10 @@ std::unique_ptr<CAssemblerCommand> parseDirectiveObjImport(Parser& parser, int f
if (list[1].evaluateIdentifier(ctorName) == false)
return nullptr;
return make_unique<DirectiveObjImport>(fileName,ctorName);
return ::make_unique<DirectiveObjImport>(fileName,ctorName);
}
return make_unique<DirectiveObjImport>(fileName);
return ::make_unique<DirectiveObjImport>(fileName);
}
std::unique_ptr<CAssemblerCommand> parseDirectiveConditional(Parser& parser, int flags)
@@ -292,7 +292,7 @@ std::unique_ptr<CAssemblerCommand> parseDirectiveConditional(Parser& parser, int
if (exp.isLoaded())
cond = make_unique<CDirectiveConditional>(type,exp);
else if (name.size() != 0)
cond = make_unique<CDirectiveConditional>(type,name);
cond = ::make_unique<CDirectiveConditional>(type,name);
else
cond = make_unique<CDirectiveConditional>(type);
@@ -328,7 +328,7 @@ std::unique_ptr<CAssemblerCommand> parseDirectiveTable(Parser& parser, int flags
encoding = getEncodingFromString(encodingName);
}
return make_unique<TableCommand>(fileName,encoding);
return ::make_unique<TableCommand>(fileName,encoding);
}
std::unique_ptr<CAssemblerCommand> parseDirectiveData(Parser& parser, int flags)
@@ -561,7 +561,7 @@ std::unique_ptr<CAssemblerCommand> parseDirectiveDefineLabel(Parser& parser, int
return nullptr;
}
return make_unique<CAssemblerLabel>(stringValue,tok.getOriginalText(),value);
return ::make_unique<CAssemblerLabel>(stringValue,tok.getOriginalText(),value);
}
std::unique_ptr<CAssemblerCommand> parseDirectiveFunction(Parser& parser, int flags)
@@ -576,7 +576,7 @@ std::unique_ptr<CAssemblerCommand> parseDirectiveFunction(Parser& parser, int fl
return nullptr;
}
auto func = make_unique<CDirectiveFunction>(tok.getStringValue(),tok.getOriginalText());
auto func = ::make_unique<CDirectiveFunction>(tok.getStringValue(),tok.getOriginalText());
std::unique_ptr<CAssemblerCommand> seq = parser.parseCommandSequence(L'.', {L".endfunc",L".endfunction",L".func",L".function"});
const std::wstring stringValue = parser.peekToken().getStringValue();
@@ -639,7 +639,7 @@ std::unique_ptr<CAssemblerCommand> Parser::parseLabel()
return nullptr;
}
return make_unique<CAssemblerLabel>(name,start.getOriginalText());
return ::make_unique<CAssemblerLabel>(name,start.getOriginalText());
}
return nullptr;

0 comments on commit 440465f

Please sign in to comment.