summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
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) {
31 return k; 31 return k;
32} 32}
33 33
34// This is the 128-bit variant of the MurmurHash3 hash function that is targetted for 64-bit 34// This is the 128-bit variant of the MurmurHash3 hash function that is targeted for 64-bit
35// platforms (MurmurHash3_x64_128). It was taken from: 35// platforms (MurmurHash3_x64_128). It was taken from:
36// https://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp 36// https://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp
37void MurmurHash3_128(const void* key, int len, u32 seed, void* out) { 37void 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;
17 * 17 *
18 * @param path The input file path as a null-terminated string 18 * @param path The input file path as a null-terminated string
19 * @param root The name of the root source directory as a null-terminated string. Path up to and 19 * @param root The name of the root source directory as a null-terminated string. Path up to and
20 * including the last occurence of this name will be stripped 20 * including the last occurrence of this name will be stripped
21 * @return A pointer to the same string passed as `path`, but starting at the trimmed portion 21 * @return A pointer to the same string passed as `path`, but starting at the trimmed portion
22 */ 22 */
23const char* TrimSourcePath(const char* path, const char* root = "src"); 23const char* TrimSourcePath(const char* path, const char* root = "src");