[Bf-blender-cvs] [5704ba7] master: Cleanup: style, spelling
Campbell Barton
noreply at git.blender.org
Wed Mar 9 09:42:25 CET 2016
Commit: 5704ba7f9bd6ec3525422e6b787c8ea115e17cf5
Author: Campbell Barton
Date: Wed Mar 9 19:31:44 2016 +1100
Branches: master
https://developer.blender.org/rB5704ba7f9bd6ec3525422e6b787c8ea115e17cf5
Cleanup: style, spelling
===================================================================
M source/blender/blenkernel/intern/unit.c
M source/blender/blenlib/intern/BLI_ghash.c
M source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index 3d7ba82..cf11fe2 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -467,9 +467,9 @@ static const char *unit_find_str(const char *str, const char *substr)
if (str_found) {
/* Previous char cannot be a letter. */
if (str_found == str ||
- /* weak unicode support!, so "µm" won't match up be replaced by "m"
- * since non ascii utf8 values will NEVER return true */
- isalpha_or_utf8(*BLI_str_prev_char_utf8(str_found)) == 0)
+ /* weak unicode support!, so "µm" won't match up be replaced by "m"
+ * since non ascii utf8 values will NEVER return true */
+ isalpha_or_utf8(*BLI_str_prev_char_utf8(str_found)) == 0)
{
/* next char cannot be alphanum */
int len_name = strlen(substr);
diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c
index 0cb3020..3815358 100644
--- a/source/blender/blenlib/intern/BLI_ghash.c
+++ b/source/blender/blenlib/intern/BLI_ghash.c
@@ -607,7 +607,7 @@ static Entry *ghash_pop(GHash *gh, GHashIterState *state)
}
/* Note: using first_bucket_index here allows us to avoid potential huge number of loops over buckets,
- * in case we are poping from a large ghash with few items in it... */
+ * in case we are popping from a large ghash with few items in it... */
curr_bucket = ghash_find_next_bucket_index(gh, curr_bucket);
Entry *e = gh->buckets[curr_bucket];
@@ -915,12 +915,12 @@ bool BLI_ghash_haskey(GHash *gh, const void *key)
}
/**
- * Remove a random entry from \a ghp, returning true if a key/value pair could be removed, false otherwise.
+ * Remove a random entry from \a gh, returning true if a key/value pair could be removed, false otherwise.
*
* \param r_key: The removed key.
* \param r_val: The removed value.
* \param state: Used for efficient removal.
- * \return true if there was somethjing to pop, false if ghash was already empty.
+ * \return true if there was something to pop, false if ghash was already empty.
*/
bool BLI_ghash_pop(
GHash *gh, GHashIterState *state,
@@ -1437,7 +1437,7 @@ bool BLI_gset_haskey(GSet *gs, const void *key)
}
/**
- * Remove a random entry from \a gsp, returning true if a key could be removed, false otherwise.
+ * Remove a random entry from \a gs, returning true if a key could be removed, false otherwise.
*
* \param r_key: The removed key.
* \param state: Used for efficient removal.
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp
index 4c85f11..e5b9f58 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.cpp
+++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp
@@ -51,7 +51,7 @@
/// @brief list of all CPUDevices. for every hardware thread an instance of CPUDevice is created
static vector<CPUDevice*> g_cpudevices;
-static ThreadLocal(CPUDevice*) g_thread_device;
+static ThreadLocal(CPUDevice *) g_thread_device;
#if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
/// @brief list of all thread for every CPUDevice in cpudevices a thread exists
More information about the Bf-blender-cvs
mailing list