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
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-10-22 05:53:35 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-10-22 05:53:35 +0400
commit74017cb0202811587c0227b9ff50ca9ae12c9a8e (patch)
tree90b08ca608bcbe8c88c43e3e12f1021f8bc5ba64 /intern
parent88473fd49a4f5330f8f6a932b0c9eccf28aaa459 (diff)
header cleanup and typo's
Diffstat (limited to 'intern')
-rw-r--r--intern/ghost/test/multitest/MultiTest.c5
-rw-r--r--intern/memutil/MEM_SmartPtr.h4
2 files changed, 4 insertions, 5 deletions
diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c
index 00939e907d6..1ba28d21808 100644
--- a/intern/ghost/test/multitest/MultiTest.c
+++ b/intern/ghost/test/multitest/MultiTest.c
@@ -50,9 +50,8 @@
extern int datatoc_bfont_ttf_size;
extern char datatoc_bfont_ttf[];
- // XXX, bad, but BLI uses these
- char bprogname[160]= "";
-char U[1024]= {0};
+ /* cheat */
+ char U[1024]= {0};
#endif
#include "Util.h"
diff --git a/intern/memutil/MEM_SmartPtr.h b/intern/memutil/MEM_SmartPtr.h
index 50d69cfd8dd..ee3c4f22536 100644
--- a/intern/memutil/MEM_SmartPtr.h
+++ b/intern/memutil/MEM_SmartPtr.h
@@ -49,14 +49,14 @@
* the Standard Template Library but without the painful get()
* semantics to access the internal c style pointer.
*
- * It is often useful to explicitely decalre ownership of memory
+ * It is often useful to explicitly declare ownership of memory
* allocated on the heap within class or function scope. This
* class helps you to encapsulate this ownership within a value
* type. When an instance of this class goes out of scope it
* makes sure that any memory associated with it's internal pointer
* is deleted. It can help to inform users of an aggregate class
* that it owns instances of it's members and these instances
- * should not be shared. This is not reliably enforcable in C++
+ * should not be shared. This is not reliably enforceable in C++
* but this class attempts to make the 1-1 relationship clear.
*
* @section Example usage