diff options
| -rw-r--r-- | src/Output.cxx | 2 | ||||
| -rw-r--r-- | test/expect/gccxml.any.Function-calling-convention-ms.xml.txt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Output.cxx b/src/Output.cxx index b74ff07..60a8359 100644 --- a/src/Output.cxx +++ b/src/Output.cxx @@ -1285,12 +1285,12 @@ void ASTVisitor::OutputFunctionHelper(clang::FunctionDecl const* d, if (clang::FunctionProtoType const* fpt = d->getType()->getAs<clang::FunctionProtoType>()) { - this->PrintFunctionTypeAttributes(fpt); this->PrintThrowsAttribute(fpt, dn->Complete); if (!clang::isa<clang::CXXConstructorDecl>(d) && !clang::isa<clang::CXXDestructorDecl>(d)) { this->PrintMangledAttribute(d); } + this->PrintFunctionTypeAttributes(fpt); } if(unsigned np = d->getNumParams()) { diff --git a/test/expect/gccxml.any.Function-calling-convention-ms.xml.txt b/test/expect/gccxml.any.Function-calling-convention-ms.xml.txt index 2a0a1b3..732d970 100644 --- a/test/expect/gccxml.any.Function-calling-convention-ms.xml.txt +++ b/test/expect/gccxml.any.Function-calling-convention-ms.xml.txt @@ -3,13 +3,13 @@ <Function id="_1" name="start" returns="_5" context="_6" location="f1:1" file="f1" line="1" mangled="[^"]+"> <Argument type="_7" location="f1:1" file="f1" line="1"/> </Function> - <Function id="_2" name="start" returns="_5" context="_6" location="f1:2" file="f1" line="2" attributes="__stdcall__" mangled="[^"]+"> + <Function id="_2" name="start" returns="_5" context="_6" location="f1:2" file="f1" line="2" mangled="[^"]+" attributes="__stdcall__"> <Argument type="_8" location="f1:2" file="f1" line="2"/> </Function> - <Function id="_3" name="start" returns="_5" context="_6" location="f1:3" file="f1" line="3" attributes="__fastcall__" mangled="[^"]+"> + <Function id="_3" name="start" returns="_5" context="_6" location="f1:3" file="f1" line="3" mangled="[^"]+" attributes="__fastcall__"> <Argument type="_9" location="f1:3" file="f1" line="3"/> </Function> - <Function id="_4" name="start" returns="_5" context="_6" location="f1:4" file="f1" line="4" attributes="__thiscall__" mangled="[^"]+"> + <Function id="_4" name="start" returns="_5" context="_6" location="f1:4" file="f1" line="4" mangled="[^"]+" attributes="__thiscall__"> <Argument type="_10" location="f1:4" file="f1" line="4"/> </Function> <FundamentalType id="_5" name="void" size="[0-9]+" align="[0-9]+"/> |