summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorRicardo de Almeida Gonzaga <ricardo.gonzaga@intel.com>2016-10-20 16:26:59 +0200
committerRicardo de Almeida Gonzaga <ricardo.gonzaga@intel.com>2016-10-20 16:26:59 +0200
commit13d46f6820f231fe245eabdd95c7e70c5b3bb023 (patch)
treefa2cf9ff34820635fcea6a48679547f40c58bd17 /src/common
parentMerge pull request #2024 from JamePeng/update-boss-code (diff)
downloadyuzu-13d46f6820f231fe245eabdd95c7e70c5b3bb023.tar
yuzu-13d46f6820f231fe245eabdd95c7e70c5b3bb023.tar.gz
yuzu-13d46f6820f231fe245eabdd95c7e70c5b3bb023.tar.bz2
yuzu-13d46f6820f231fe245eabdd95c7e70c5b3bb023.tar.lz
yuzu-13d46f6820f231fe245eabdd95c7e70c5b3bb023.tar.xz
yuzu-13d46f6820f231fe245eabdd95c7e70c5b3bb023.tar.zst
yuzu-13d46f6820f231fe245eabdd95c7e70c5b3bb023.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/hash.cpp2
-rw-r--r--src/common/logging/text_formatter.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index 5aa5118eb..2309320bb 100644
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -31,7 +31,7 @@ static FORCE_INLINE u64 fmix64(u64 k) {
return k;
}
-// This is the 128-bit variant of the MurmurHash3 hash function that is targetted for 64-bit
+// This is the 128-bit variant of the MurmurHash3 hash function that is targeted for 64-bit
// platforms (MurmurHash3_x64_128). It was taken from:
// https://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp
void MurmurHash3_128(const void* key, int len, u32 seed, void* out) {
diff --git a/src/common/logging/text_formatter.h b/src/common/logging/text_formatter.h
index 0da102bc6..749268310 100644
--- a/src/common/logging/text_formatter.h
+++ b/src/common/logging/text_formatter.h
@@ -17,7 +17,7 @@ struct Entry;
*
* @param path The input file path as a null-terminated string
* @param root The name of the root source directory as a null-terminated string. Path up to and
- * including the last occurence of this name will be stripped
+ * including the last occurrence of this name will be stripped
* @return A pointer to the same string passed as `path`, but starting at the trimmed portion
*/
const char* TrimSourcePath(const char* path, const char* root = "src");