瀏覽代碼

Template fix

Brian Fiete 6 月之前
父節點
當前提交
e288fca943
共有 2 個文件被更改,包括 14 次插入14 次删除
  1. 8 8
      BeefySysLib/util/Array.h
  2. 6 6
      BeefySysLib/util/SizedArray.h

+ 8 - 8
BeefySysLib/util/Array.h

@@ -450,7 +450,7 @@ protected:
 
 	void SetBufferSize(intptr newSize)
 	{
-		T* newVals = allocate<T>(newSize);
+		T* newVals = TAlloc::template allocate<T>(newSize);
 		if (this->mVals != NULL)
 		{
 			if (this->mSize > 0)
@@ -630,7 +630,7 @@ public:
 		{
 			intptr newSize = this->mAllocSize + this->mAllocSize / 2 + 1;
 
-			T* newVals = allocate<T>(newSize);
+			T* newVals = TAlloc::template allocate<T>(newSize);
 			if (this->mVals != NULL)
 			{
 				if (idx > 0) // Copy left of idx
@@ -658,7 +658,7 @@ public:
 		{
 			intptr newSize = BF_MAX(this->mSize + size, this->mAllocSize + this->mAllocSize / 2 + 1);
 
-			T* newVals = allocate<T>(newSize);
+			T* newVals = TAlloc::template allocate<T>(newSize);
 			if (this->mVals != NULL)
 			{
 				if (idx > 0) // Copy left of idx
@@ -687,7 +687,7 @@ public:
 		{
 			intptr newSize = BF_MAX(this->mSize + count, this->mAllocSize + this->mAllocSize / 2 + 1);
 
-			T* newVals = allocate<T>(newSize);
+			T* newVals = TAlloc::template allocate<T>(newSize);
 			if (this->mVals != NULL)
 			{
 				if (idx > 0) // Copy left of idx
@@ -769,7 +769,7 @@ public:
 protected:
 	void SetBufferSize(intptr newSize)
 	{
-		T* newVals = allocate<T>(newSize);
+		T* newVals = TAlloc::template allocate<T>(newSize);
 		if (this->mVals != NULL)
 		{
 			if (this->mSize > 0)
@@ -933,7 +933,7 @@ public:
 		{
 			intptr newSize = this->mAllocSize + this->mAllocSize / 2 + 1;
 
-			T* newVals = allocate<T>(newSize);
+			T* newVals = TAlloc::template allocate<T>(newSize);
 			if (this->mVals != NULL)
 			{
 				if (idx > 0) // Copy left of idx
@@ -961,7 +961,7 @@ public:
 		{
 			intptr newSize = BF_MAX(this->mSize + size, this->mAllocSize + this->mAllocSize / 2 + 1);
 
-			T* newVals = allocate<T>(newSize);
+			T* newVals = TAlloc::template allocate<T>(newSize);
 			if (this->mVals != NULL)
 			{
 				if (idx > 0) // Copy left of idx
@@ -989,7 +989,7 @@ public:
 		{
 			intptr newSize = BF_MAX(this->mSize + size, this->mAllocSize + this->mAllocSize / 2 + 1);
 
-			T* newVals = allocate<T>(newSize);
+			T* newVals = TAlloc::template allocate<T>(newSize);
 			if (this->mVals != NULL)
 			{
 				if (idx > 0) // Copy left of idx

+ 6 - 6
BeefySysLib/util/SizedArray.h

@@ -378,7 +378,7 @@ protected:
 
 	void Grow(intptr newSize)
 	{
-		T* newVals = allocate<T>(newSize);
+		T* newVals = TAlloc::template allocate<T>(newSize);
 		if (this->mVals != NULL)
 		{
 			if (this->mSize > 0)
@@ -533,7 +533,7 @@ public:
 		{
 			intptr newSize = this->mAllocSize + this->mAllocSize / 2 + 1;
 
-			T* newVals =  allocate<T>(newSize);
+			T* newVals =  TAlloc::template allocate<T>(newSize);
 			if (this->mVals != NULL)
 			{
 				if (idx > 0) // Copy left of idx
@@ -562,7 +562,7 @@ public:
 		{
 			intptr newSize = BF_MAX(this->mSize + size, this->mAllocSize + this->mAllocSize / 2 + 1);
 
-			T* newVals =  allocate<T>(newSize);
+			T* newVals =  TAlloc::template allocate<T>(newSize);
 			if (this->mVals != NULL)
 			{
 				if (idx > 0) // Copy left of idx
@@ -638,7 +638,7 @@ public:
 protected:
 	void Grow(intptr newSize)
 	{
-		T* newVals =  allocate<T>(newSize);
+		T* newVals =  TAlloc::template allocate<T>(newSize);
 		if (this->mVals != NULL)
 		{
 			if (this->mSize > 0)
@@ -761,7 +761,7 @@ public:
 		{
 			intptr newSize = this->mAllocSize + this->mAllocSize / 2 + 1;
 
-			T* newVals =  allocate<T>(newSize);
+			T* newVals =  TAlloc::template allocate<T>(newSize);
 			if (this->mVals != NULL)
 			{
 				if (idx > 0) // Copy left of idx
@@ -790,7 +790,7 @@ public:
 		{
 			intptr newSize = BF_MAX(this->mSize + size, this->mAllocSize + this->mAllocSize / 2 + 1);
 
-			T* newVals =  allocate<T>(newSize);
+			T* newVals =  TAlloc::template allocate<T>(newSize);
 			if (this->mVals != NULL)
 			{
 				if (idx > 0) // Copy left of idx