From b89e036a6f3f94c28eff53d1f514c30d3aae746f Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Sun, 16 Aug 2020 08:34:31 -0700 Subject: [PATCH] Removed unnecessary [Friend] attributes --- BeefLibs/corlib/src/Runtime.bf | 2 +- BeefLibs/corlib/src/String.bf | 4 ++-- BeefLibs/corlib/src/Threading/Tasks/Future.bf | 2 +- BeefLibs/corlib/src/Threading/Thread.bf | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BeefLibs/corlib/src/Runtime.bf b/BeefLibs/corlib/src/Runtime.bf index 79b7c0b6..8ded2653 100644 --- a/BeefLibs/corlib/src/Runtime.bf +++ b/BeefLibs/corlib/src/Runtime.bf @@ -166,7 +166,7 @@ namespace System static Object Object_DynamicCastToTypeId(Object obj, int32 typeId) { #if BF_DYNAMIC_CAST_CHECK - return obj.[Friend]DynamicCastToTypeId(typeId); + return obj.DynamicCastToTypeId(typeId); #else return null; #endif diff --git a/BeefLibs/corlib/src/String.bf b/BeefLibs/corlib/src/String.bf index 753c112c..6d6e0eb0 100644 --- a/BeefLibs/corlib/src/String.bf +++ b/BeefLibs/corlib/src/String.bf @@ -2897,7 +2897,7 @@ namespace System char8 firstC = subStr[0]; for (int ofs = startIdx; ofs <= mLength - subStr.mLength; ofs++) { - if ((mPtr[ofs] == firstC) && (String.[Friend]Compare(mPtr + ofs + 1, subStr.mLength - 1, subStr.mPtr + 1, subStr.mLength - 1, ignoreCase) == 0)) + if ((mPtr[ofs] == firstC) && (String.Compare(mPtr + ofs + 1, subStr.mLength - 1, subStr.mPtr + 1, subStr.mLength - 1, ignoreCase) == 0)) return ofs; } @@ -2913,7 +2913,7 @@ namespace System for (int ofs = startIdx; ofs <= mLength - subStr.mLength; ofs++) { if (((mPtr[ofs] == firstC) || (mPtr[ofs] == firstC2)) && - (String.[Friend]Compare(mPtr + ofs + 1, subStr.mLength - 1, subStr.mPtr + 1, subStr.mLength - 1, ignoreCase) == 0)) + (String.Compare(mPtr + ofs + 1, subStr.mLength - 1, subStr.mPtr + 1, subStr.mLength - 1, ignoreCase) == 0)) return ofs; } } diff --git a/BeefLibs/corlib/src/Threading/Tasks/Future.bf b/BeefLibs/corlib/src/Threading/Tasks/Future.bf index 3484f44e..44a5b59d 100644 --- a/BeefLibs/corlib/src/Threading/Tasks/Future.bf +++ b/BeefLibs/corlib/src/Threading/Tasks/Future.bf @@ -88,7 +88,7 @@ namespace System.Threading.Tasks protected TResult GetResultCore(bool waitCompletionNotification) { // If the result has not been calculated yet, wait for it. - if (!IsCompleted) this.[Friend]InternalWait(Timeout.Infinite, default(CancellationToken)); // won't throw if task faulted or canceled; that's handled below + if (!IsCompleted) InternalWait(Timeout.Infinite, default(CancellationToken)); // won't throw if task faulted or canceled; that's handled below // Notify the debugger of the wait completion if it's requested such a notification //TODO: Implement diff --git a/BeefLibs/corlib/src/Threading/Thread.bf b/BeefLibs/corlib/src/Threading/Thread.bf index f31f863b..5ef54934 100644 --- a/BeefLibs/corlib/src/Threading/Thread.bf +++ b/BeefLibs/corlib/src/Threading/Thread.bf @@ -26,7 +26,7 @@ namespace System.Threading { static Object Thread_Alloc() { - return Thread.[Friend]CreateEmptyThread(); + return Thread.CreateEmptyThread(); } static Object Thread_GetMainThread()