Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-11-20 03:39:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-11-20 03:39:22 +0300
commit25266caa454324b3394c09920913fb419b5abf2b (patch)
treed3280dfb512accb74a7e06fc9841d1228e96dd59 /intern/guardedalloc
parent5f1bb8da96c47e3feea9853eb479fb565aeaa2fa (diff)
Cleanup: spelling
Diffstat (limited to 'intern/guardedalloc')
-rw-r--r--intern/guardedalloc/MEM_guardedalloc.h4
-rw-r--r--intern/guardedalloc/intern/mallocn.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h
index 0f30f7bd1a5..a0174e30aff 100644
--- a/intern/guardedalloc/MEM_guardedalloc.h
+++ b/intern/guardedalloc/MEM_guardedalloc.h
@@ -239,7 +239,7 @@ void MEM_use_lockfree_allocator(void);
*
* Use for debug purposes. This allocator contains lock section around every allocator call, which
* makes it slow. What is gained with this is the ability to have list of allocated blocks (in an
- * addition to the trackign of number of allocations and amount of allocated bytes).
+ * addition to the tracking of number of allocations and amount of allocated bytes).
*
* NOTE: The switch between allocator types can only happen before any allocation did happen. */
void MEM_use_guarded_allocator(void);
@@ -249,7 +249,7 @@ void MEM_use_guarded_allocator(void);
#endif /* __cplusplus */
#ifdef __cplusplus
-/* alloc funcs for C++ only */
+/* Allocation functions (for C++ only). */
# define MEM_CXX_CLASS_ALLOC_FUNCS(_id) \
public: \
void *operator new(size_t num_bytes) \
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index f0dd29a0b9e..673821546e8 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -99,7 +99,7 @@ void aligned_free(void *ptr)
/* Perform assert checks on allocator type change.
*
* Helps catching issues (in debug build) caused by an unintended allocator type change when there
- * are allocation happenned. */
+ * are allocation happened. */
static void assert_for_allocator_change(void)
{
/* NOTE: Assume that there is no "sticky" internal state which would make switching allocator