Przeglądaj źródła

Build: Fixing a couple of compilation errors on GCC

BearishSun 8 lat temu
rodzic
commit
876d5fd7e4

+ 3 - 3
Source/BansheeUtility/Utility/BsOctree.h

@@ -709,7 +709,7 @@ namespace bs
 				{
 				{
 					// Create the child node if needed, and add the element to it
 					// Create the child node if needed, and add the element to it
 					if (!node->mChildren[child.index])
 					if (!node->mChildren[child.index])
-						node->mChildren[child.index] = mNodeAlloc.construct<Node>(node);
+						node->mChildren[child.index] = mNodeAlloc.template construct<Node>(node);
 
 
 					addElementToNode(elem, node->mChildren[child.index], nodeBounds.getChild(child));
 					addElementToNode(elem, node->mChildren[child.index], nodeBounds.getChild(child));
 				}
 				}
@@ -739,8 +739,8 @@ namespace bs
 			UINT32 freeIdx = elements.count % Options::MaxElementsPerNode;
 			UINT32 freeIdx = elements.count % Options::MaxElementsPerNode;
 			if(freeIdx == 0) // New group needed
 			if(freeIdx == 0) // New group needed
 			{
 			{
-				ElementGroup* elementGroup = (ElementGroup*)mElemAlloc.construct<ElementGroup>();
-				ElementBoundGroup* boundGroup = (ElementBoundGroup*)mElemBoundsAlloc.construct<ElementBoundGroup>();
+				ElementGroup* elementGroup = (ElementGroup*)mElemAlloc.template construct<ElementGroup>();
+				ElementBoundGroup* boundGroup = (ElementBoundGroup*)mElemBoundsAlloc.template construct<ElementBoundGroup>();
 
 
 				elementGroup->next = elements.values;
 				elementGroup->next = elements.values;
 				boundGroup->next = elements.bounds;
 				boundGroup->next = elements.bounds;

+ 2 - 2
Source/RenderBeast/BsPostProcessing.h

@@ -315,8 +315,8 @@ namespace bs { namespace ct
 		static ShaderVariation VAR_##x##_NoAutoExposure_NoMSAA;
 		static ShaderVariation VAR_##x##_NoAutoExposure_NoMSAA;
 
 
 #define VARIATION_VOLUME_LUT(x)			\
 #define VARIATION_VOLUME_LUT(x)			\
-		VARIATION_GAMMA(##x##_Gamma)	\
-		VARIATION_GAMMA(##x##_NoGamma)
+		VARIATION_GAMMA(x##_Gamma)	\
+		VARIATION_GAMMA(x##_NoGamma)
 
 
 		VARIATION_VOLUME_LUT(VolumeLUT)
 		VARIATION_VOLUME_LUT(VolumeLUT)
 		VARIATION_VOLUME_LUT(NoVolumeLUT)
 		VARIATION_VOLUME_LUT(NoVolumeLUT)