From de2f1ea5f28a4ba13cc2f6dcfb288c9a4ad8c7a2 Mon Sep 17 00:00:00 2001 From: Riatre Foo Date: Sat, 31 Aug 2019 06:22:45 +0800 Subject: [PATCH] Fix build errors on Windows after massive rename. --- src/platform_win.cc | 8 ++++---- src/project.cc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/platform_win.cc b/src/platform_win.cc index fd936289..7d8dc66e 100644 --- a/src/platform_win.cc +++ b/src/platform_win.cc @@ -31,7 +31,7 @@ limitations under the License. #include namespace ccls { -std::string NormalizePath(const std::string &path) { +std::string normalizePath(const std::string &path) { DWORD retval = 0; TCHAR buffer[MAX_PATH] = TEXT(""); TCHAR **lpp_part = {NULL}; @@ -52,12 +52,12 @@ std::string NormalizePath(const std::string &path) { return result; } -void FreeUnusedMemory() {} +void freeUnusedMemory() {} // TODO Wait for debugger to attach -void TraceMe() {} +void traceMe() {} -void SpawnThread(void *(*fn)(void *), void *arg) { +void spawnThread(void *(*fn)(void *), void *arg) { std::thread(fn, arg).detach(); } } // namespace ccls diff --git a/src/project.cc b/src/project.cc index f8b9e601..d573750c 100644 --- a/src/project.cc +++ b/src/project.cc @@ -378,7 +378,7 @@ void Project::loadDirectory(const std::string &root, Project::Folder &folder) { #ifdef _WIN32 char tmpdir[L_tmpnam]; tmpnam_s(tmpdir, L_tmpnam); - CDBDir = tmpdir; + cDBDir = tmpdir; if (sys::fs::create_directory(tmpdir, false)) return; #else @@ -414,9 +414,9 @@ void Project::loadDirectory(const std::string &root, Project::Folder &folder) { tooling::CompilationDatabase::loadFromDirectory(cDBDir, err_msg); if (!g_config->compilationDatabaseCommand.empty()) { #ifdef _WIN32 - DeleteFileA(StdinPath.c_str()); - DeleteFileA(Path.c_str()); - RemoveDirectoryA(CDBDir.c_str()); + DeleteFileA(stdinPath.c_str()); + DeleteFileA(path.c_str()); + RemoveDirectoryA(cDBDir.c_str()); #else unlink(stdinPath.c_str()); unlink(path.c_str());