summaryrefslogtreecommitdiff
path: root/indra/llvfs
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-10-14 10:18:41 -0700
committerRichard Linden <none@none>2013-10-14 10:18:41 -0700
commit1acceb3633c0f0c4fdf29b17d77d67c8a9b71986 (patch)
tree7fef10e1031417a866243a90df43654ad4659aca /indra/llvfs
parenta6a40bd69f2011337b138d833d412b2b3568f8ea (diff)
changed ll_aligned_(malloc|free) to take alignment size as a template argument
Diffstat (limited to 'indra/llvfs')
-rwxr-xr-xindra/llvfs/llvfile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp
index 9b57246ea1..add88fe0a3 100755
--- a/indra/llvfs/llvfile.cpp
+++ b/indra/llvfs/llvfile.cpp
@@ -137,12 +137,12 @@ U8* LLVFile::readFile(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, S
}
else
{
- data = (U8*) ll_aligned_malloc(16, file_size);
+ data = (U8*) ll_aligned_malloc<16>(file_size);
file.read(data, file_size); /* Flawfinder: ignore */
if (file.getLastBytesRead() != (S32)file_size)
{
- ll_aligned_free(16, data);
+ ll_aligned_free<16>(data);
data = NULL;
file_size = 0;
}