michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(util/realpath): rename realpath to lrealpath

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2014-08-04 14:42:44 -07:00
parent bc4cef9ecb
commit 53c7124c2b
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/CMakeLists.txt
View file

@ -64,6 +64,9 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
set(CMAKE_CXX_FLAGS_GPROF "-O2 -g -pg") set(CMAKE_CXX_FLAGS_GPROF "-O2 -g -pg")
include(CheckIncludeFileCXX)
check_include_file_cxx("unistd.h" HAVE_UNISTD)
# SPLIT_STACK # SPLIT_STACK
if ("${SPLIT_STACK}" MATCHES "ON") if ("${SPLIT_STACK}" MATCHES "ON")
if ((${CMAKE_SYSTEM_NAME} MATCHES "Linux") AND ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")) if ((${CMAKE_SYSTEM_NAME} MATCHES "Linux") AND ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU"))

2
src/util/lean_path.cpp
View file

@ -219,7 +219,7 @@ optional<std::string> check_file(std::string const & path, std::string const & f
file += ext; file += ext;
std::ifstream ifile(file); std::ifstream ifile(file);
if (ifile) if (ifile)
return optional<std::string>(realpath(file.c_str())); return optional<std::string>(lrealpath(file.c_str()));
else else
return optional<std::string>(); return optional<std::string>();
} }

5
src/util/realpath.cpp
View file

@ -7,12 +7,13 @@ Author: Leonardo de Moura
#include <string> #include <string>
#include <cstdlib> #include <cstdlib>
#include "util/realpath.h" #include "util/realpath.h"
#ifdef LEAN_WINDOWS #ifdef LEAN_WINDOWS
#include <windows.h> #include <windows.h>
#endif #endif
namespace lean { namespace lean {
std::string realpath(char const * fname) { std::string lrealpath(char const * fname) {
#ifdef LEAN_WINDOWS #ifdef LEAN_WINDOWS
constexpr unsigned BufferSize = 8192; constexpr unsigned BufferSize = 8192;
char buffer[BufferSize]; char buffer[BufferSize];
@ -23,7 +24,7 @@ std::string realpath(char const * fname) {
return std::string(buffer); return std::string(buffer);
} }
#else #else
char * tmp = ::realpath(fname, nullptr); char * tmp = realpath(fname, nullptr);
std::string r(tmp); std::string r(tmp);
free(tmp); free(tmp);
return r; return r;

2
src/util/realpath.h
View file

@ -7,5 +7,5 @@ Author: Leonardo de Moura
#pragma once #pragma once
#include <string> #include <string>
namespace lean { namespace lean {
std::string realpath(char const * fname); std::string lrealpath(char const * fname);
} }