summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-03-26 23:37:05 -0400
committerGravatar GitHub2018-03-26 23:37:05 -0400
commit1a28f4fa8c94ad43d757eeb7fc137024f356db87 (patch)
tree206bb2c17cd77562691bcb1bba79fd54bad9d68e /src
parentMerge pull request #279 from bunnei/tegra-progress-3 (diff)
parentlog.h: Change comment from citra to yuzu (diff)
downloadyuzu-1a28f4fa8c94ad43d757eeb7fc137024f356db87.tar.gz
yuzu-1a28f4fa8c94ad43d757eeb7fc137024f356db87.tar.xz
yuzu-1a28f4fa8c94ad43d757eeb7fc137024f356db87.zip
Merge pull request #282 from N00byKing/patch-2
Change comments from citra to yuzu
Diffstat (limited to 'src')
-rw-r--r--src/common/file_util.h2
-rw-r--r--src/common/logging/log.h2
-rw-r--r--src/common/x64/cpu_detect.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/common/file_util.h b/src/common/file_util.h
index 630232a25..143f099eb 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -121,7 +121,7 @@ void CopyDir(const std::string& source_path, const std::string& dest_path);
121// Set the current directory to given directory 121// Set the current directory to given directory
122bool SetCurrentDir(const std::string& directory); 122bool SetCurrentDir(const std::string& directory);
123 123
124// Returns a pointer to a string with a Citra data dir in the user's home 124// Returns a pointer to a string with a yuzu data dir in the user's home
125// directory. To be used in "multi-user" mode (that is, installed). 125// directory. To be used in "multi-user" mode (that is, installed).
126const std::string& GetUserPath(const unsigned int DirIDX, const std::string& newPath = ""); 126const std::string& GetUserPath(const unsigned int DirIDX, const std::string& newPath = "");
127 127
diff --git a/src/common/logging/log.h b/src/common/logging/log.h
index d8dbab939..6913f6b10 100644
--- a/src/common/logging/log.h
+++ b/src/common/logging/log.h
@@ -85,7 +85,7 @@ enum class Class : ClassType {
85 Loader, ///< ROM loader 85 Loader, ///< ROM loader
86 Input, ///< Input emulation 86 Input, ///< Input emulation
87 Network, ///< Network emulation 87 Network, ///< Network emulation
88 WebService, ///< Interface to Citra Web Services 88 WebService, ///< Interface to yuzu Web Services
89 Count ///< Total number of logging classes 89 Count ///< Total number of logging classes
90}; 90};
91 91
diff --git a/src/common/x64/cpu_detect.cpp b/src/common/x64/cpu_detect.cpp
index 62f17fbb5..2dfcd39c8 100644
--- a/src/common/x64/cpu_detect.cpp
+++ b/src/common/x64/cpu_detect.cpp
@@ -54,7 +54,7 @@ static CPUCaps Detect() {
54 caps.num_cores = std::thread::hardware_concurrency(); 54 caps.num_cores = std::thread::hardware_concurrency();
55 55
56 // Assumes the CPU supports the CPUID instruction. Those that don't would likely not support 56 // Assumes the CPU supports the CPUID instruction. Those that don't would likely not support
57 // Citra at all anyway 57 // yuzu at all anyway
58 58
59 int cpu_id[4]; 59 int cpu_id[4];
60 memset(caps.brand_string, 0, sizeof(caps.brand_string)); 60 memset(caps.brand_string, 0, sizeof(caps.brand_string));