From b5aa92ff33f3a78e577db6865ff9db88988e46f1 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Wed, 20 Jan 2021 08:23:35 -0800 Subject: [PATCH] Removing CVarAttribute --- BeefLibs/corlib/src/Attribute.bf | 6 ------ IDEHelper/Compiler/BfDefBuilder.cpp | 4 +--- IDEHelper/Compiler/BfSystem.h | 3 +-- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/BeefLibs/corlib/src/Attribute.bf b/BeefLibs/corlib/src/Attribute.bf index 47a719c7..caa8150d 100644 --- a/BeefLibs/corlib/src/Attribute.bf +++ b/BeefLibs/corlib/src/Attribute.bf @@ -251,12 +251,6 @@ namespace System } - [AttributeUsage(.Method /*2*/)] - public struct CVarArgsAttribute : Attribute - { - - } - [AttributeUsage(.Method /*2*/)] public struct NoReturnAttribute : Attribute { diff --git a/IDEHelper/Compiler/BfDefBuilder.cpp b/IDEHelper/Compiler/BfDefBuilder.cpp index 8bc13fa3..8a9f5d61 100644 --- a/IDEHelper/Compiler/BfDefBuilder.cpp +++ b/IDEHelper/Compiler/BfDefBuilder.cpp @@ -803,9 +803,7 @@ void BfDefBuilder::ParseAttributes(BfAttributeDirective* attributes, BfMethodDef if (typeRefName == "CLink") methodDef->mCLink = true; else if (typeRefName == "StdCall") - methodDef->mCallingConvention = BfCallingConvention_Stdcall; - else if (typeRefName == "CVarArgs") - methodDef->mCallingConvention = BfCallingConvention_CVarArgs; + methodDef->mCallingConvention = BfCallingConvention_Stdcall; else if (typeRefName == "Inline") { if (methodDef->mIsExtern) diff --git a/IDEHelper/Compiler/BfSystem.h b/IDEHelper/Compiler/BfSystem.h index 8c51ce91..dc7876c4 100644 --- a/IDEHelper/Compiler/BfSystem.h +++ b/IDEHelper/Compiler/BfSystem.h @@ -720,8 +720,7 @@ enum BfCallingConvention : uint8 BfCallingConvention_Unspecified, BfCallingConvention_Cdecl, BfCallingConvention_Stdcall, - BfCallingConvention_Fastcall, - BfCallingConvention_CVarArgs, + BfCallingConvention_Fastcall, }; #define BF_METHODNAME_MARKMEMBERS "GCMarkMembers"