Browse Source

Merge pull request #282 from N00byKing/patch-2

Change comments from citra to yuzu
nce_cpp
bunnei 8 years ago
committed by GitHub
parent
commit
81d12e3466
  1. 2
      hooks/pre-commit
  2. 2
      src/common/file_util.h
  3. 2
      src/common/logging/log.h
  4. 2
      src/common/x64/cpu_detect.cpp

2
hooks/pre-commit

@ -1,6 +1,6 @@
#!/bin/sh
# Enforce citra's whitespace policy
# Enforce yuzu's whitespace policy
git config --local core.whitespace tab-in-indent,trailing-space
paths_to_check="src/ CMakeLists.txt"

2
src/common/file_util.h

@ -121,7 +121,7 @@ void CopyDir(const std::string& source_path, const std::string& dest_path);
// Set the current directory to given directory
bool SetCurrentDir(const std::string& directory);
// Returns a pointer to a string with a Citra data dir in the user's home
// Returns a pointer to a string with a yuzu data dir in the user's home
// directory. To be used in "multi-user" mode (that is, installed).
const std::string& GetUserPath(const unsigned int DirIDX, const std::string& newPath = "");

2
src/common/logging/log.h

@ -85,7 +85,7 @@ enum class Class : ClassType {
Loader, ///< ROM loader
Input, ///< Input emulation
Network, ///< Network emulation
WebService, ///< Interface to Citra Web Services
WebService, ///< Interface to yuzu Web Services
Count ///< Total number of logging classes
};

2
src/common/x64/cpu_detect.cpp

@ -54,7 +54,7 @@ static CPUCaps Detect() {
caps.num_cores = std::thread::hardware_concurrency();
// Assumes the CPU supports the CPUID instruction. Those that don't would likely not support
// Citra at all anyway
// yuzu at all anyway
int cpu_id[4];
memset(caps.brand_string, 0, sizeof(caps.brand_string));

Loading…
Cancel
Save