Oh Linux... why you so whimy?

L'In20Cible · L'In20Cible · commit d23efab10bcb · 2016-10-30T22:51:38.000-04:00
diff --git a/src/core/modules/filters/filters_recipients.h b/src/core/modules/filters/filters_recipients.h
@@ -46,17 +46,15 @@ template<class T, class U = int>
 class CRecipientFilterAllocator : public CUtlMemory<T, U>
 {
 public:
-	CRecipientFilterAllocator(int nGrowSize = 0, int nInitSize = 0)
-	{
-		::CUtlMemory<T, U>(nGrowSize, nInitSize);
-	}
+	CRecipientFilterAllocator(int nGrowSize = 0, int nInitSize = 0):
+		CUtlMemory<T, U>(nGrowSize, nInitSize) {}
 
-	~CRecipientFilterAllocator() { m_nAllocationCount = 0; }
+	~CRecipientFilterAllocator() { this->m_nAllocationCount = 0; }
 
 	void *DetachAndReturn()
 	{
-		void *pMemory = m_pMemory;
-		m_pMemory = NULL;
+		void *pMemory = this->m_pMemory;
+		this->m_pMemory = NULL;
 		return pMemory;
 	}
 };
@@ -65,9 +63,12 @@ template<class T, class U = CRecipientFilterAllocator<T>>
 class CVecRecipients : public CUtlVector<T, U>
 {
 public:
+	CVecRecipients(int nGrowSize = 0, int nInitSize = 0):
+		CUtlVector<T, U>(nGrowSize, nInitSize) {}
+
 	~CVecRecipients()
 	{
-		UTIL_Dealloc(m_Memory.DetachAndReturn());
+		UTIL_Dealloc(this->m_Memory.DetachAndReturn());
 	}
 };
 

Original file line number	Diff line number	Diff line change
`@@ -46,17 +46,15 @@ template<class T, class U = int>`
`46`	`46`	`class CRecipientFilterAllocator : public CUtlMemory<T, U>`
`47`	`47`	`{`
`48`	`48`	`public:`
`49`		`- CRecipientFilterAllocator(int nGrowSize = 0, int nInitSize = 0)`
`50`		`- {`
`51`		`- ::CUtlMemory<T, U>(nGrowSize, nInitSize);`
`52`		`- }`
	`49`	`+ CRecipientFilterAllocator(int nGrowSize = 0, int nInitSize = 0):`
	`50`	`+ CUtlMemory<T, U>(nGrowSize, nInitSize) {}`
`53`	`51`
`54`		`- ~CRecipientFilterAllocator() { m_nAllocationCount = 0; }`
	`52`	`+ ~CRecipientFilterAllocator() { this->m_nAllocationCount = 0; }`
`55`	`53`
`56`	`54`	`void *DetachAndReturn()`
`57`	`55`	`{`
`58`		`- void *pMemory = m_pMemory;`
`59`		`- m_pMemory = NULL;`
	`56`	`+ void *pMemory = this->m_pMemory;`
	`57`	`+ this->m_pMemory = NULL;`
`60`	`58`	`return pMemory;`
`61`	`59`	`}`
`62`	`60`	`};`
`@@ -65,9 +63,12 @@ template<class T, class U = CRecipientFilterAllocator<T>>`
`65`	`63`	`class CVecRecipients : public CUtlVector<T, U>`
`66`	`64`	`{`
`67`	`65`	`public:`
	`66`	`+ CVecRecipients(int nGrowSize = 0, int nInitSize = 0):`
	`67`	`+ CUtlVector<T, U>(nGrowSize, nInitSize) {}`
	`68`	`+`
`68`	`69`	`~CVecRecipients()`
`69`	`70`	`{`
`70`		`- UTIL_Dealloc(m_Memory.DetachAndReturn());`
	`71`	`+ UTIL_Dealloc(this->m_Memory.DetachAndReturn());`
`71`	`72`	`}`
`72`	`73`	`};`
`73`	`74`