mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-23 14:48:19 -05:00
KWSys 2020-03-04 (6af2e592)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 6af2e59217a7e10ed507da564a1445b60ac2a095 (master).
Upstream Shortlog
-----------------
Hans Johnson (17):
81d1e737 STYLE: Use modern path naming
28b8e6c2 STYLE: Convert CMake-language commands to lower case
6ce3d69a DOC: Update documentation for modern add_subdirectory.
8a7fe7ac STYLE: Remove redundant void argument lists
1c3e193d COMP: Use nullptr instead of 0 or NULL
2a4c1252 STYLE: Replace integer literals which are cast to bool.
0fe7214d STYLE: Make prototype match definition names
3b30d0ff STYLE: Make prototype match definition names
691d5612 PERF: readability container size empty
7be4043f STYLE: Prefer c++11 'using' to 'typedef'
acc916ed COMP: Prefer const pointer when value does not change
4c7f64eb COMP: Prefer const member functions
d07092a0 STYLE: Use default member initialization
6d20e7c9 STYLE: Prefer = default to explicitly trivial implementations
91429382 PERF: emplace_back method results in potentially more efficient code
cc8fc323 STYLE: Use auto for variable type matches the type of the initializer
6621b069 STYLE: Use range-based loops from C++11
Julien Schueller (1):
a1a261ac CMake: Fix psapi lib name on case-sensitive fs
This commit is contained in:
committed by
Brad King
parent
4e8c4c7ebe
commit
ec33e3600c
+7
-5
@@ -152,10 +152,11 @@ static int kwsysProcessCreate(kwsysProcess* cp, int prIndex,
|
||||
static void kwsysProcessDestroy(kwsysProcess* cp);
|
||||
static int kwsysProcessSetupOutputPipeFile(int* p, const char* name);
|
||||
static int kwsysProcessSetupOutputPipeNative(int* p, int des[2]);
|
||||
static int kwsysProcessGetTimeoutTime(kwsysProcess* cp, double* userTimeout,
|
||||
static int kwsysProcessGetTimeoutTime(kwsysProcess* cp,
|
||||
const double* userTimeout,
|
||||
kwsysProcessTime* timeoutTime);
|
||||
static int kwsysProcessGetTimeoutLeft(kwsysProcessTime* timeoutTime,
|
||||
double* userTimeout,
|
||||
const double* userTimeout,
|
||||
kwsysProcessTimeNative* timeoutLength,
|
||||
int zeroIsExpired);
|
||||
static kwsysProcessTime kwsysProcessTimeGetCurrent(void);
|
||||
@@ -571,7 +572,7 @@ void kwsysProcess_SetPipeShared(kwsysProcess* cp, int prPipe, int shared)
|
||||
}
|
||||
}
|
||||
|
||||
void kwsysProcess_SetPipeNative(kwsysProcess* cp, int prPipe, int p[2])
|
||||
void kwsysProcess_SetPipeNative(kwsysProcess* cp, int prPipe, const int p[2])
|
||||
{
|
||||
int* pPipeNative = 0;
|
||||
|
||||
@@ -1959,7 +1960,8 @@ static int kwsysProcessSetupOutputPipeNative(int* p, int des[2])
|
||||
|
||||
/* Get the time at which either the process or user timeout will
|
||||
expire. Returns 1 if the user timeout is first, and 0 otherwise. */
|
||||
static int kwsysProcessGetTimeoutTime(kwsysProcess* cp, double* userTimeout,
|
||||
static int kwsysProcessGetTimeoutTime(kwsysProcess* cp,
|
||||
const double* userTimeout,
|
||||
kwsysProcessTime* timeoutTime)
|
||||
{
|
||||
/* The first time this is called, we need to calculate the time at
|
||||
@@ -1991,7 +1993,7 @@ static int kwsysProcessGetTimeoutTime(kwsysProcess* cp, double* userTimeout,
|
||||
/* Get the length of time before the given timeout time arrives.
|
||||
Returns 1 if the time has already arrived, and 0 otherwise. */
|
||||
static int kwsysProcessGetTimeoutLeft(kwsysProcessTime* timeoutTime,
|
||||
double* userTimeout,
|
||||
const double* userTimeout,
|
||||
kwsysProcessTimeNative* timeoutLength,
|
||||
int zeroIsExpired)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user