projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify some checks by using __CLANG_PREREQ
[folly.git]
/
folly
/
Subprocess.h
diff --git
a/folly/Subprocess.h
b/folly/Subprocess.h
index 0354b4b21e56d11450fbd2db98fc41650ac33de4..cdd8e38d25aeacadd117747e10e60ed710f7d99e 100644
(file)
--- a/
folly/Subprocess.h
+++ b/
folly/Subprocess.h
@@
-126,12
+126,18
@@
class ProcessReturnCode {
friend class Subprocess;
public:
enum State {
friend class Subprocess;
public:
enum State {
+ // Subprocess starts in the constructor, so this state designates only
+ // default-initialized or moved-out ProcessReturnCodes.
NOT_STARTED,
RUNNING,
EXITED,
KILLED
};
NOT_STARTED,
RUNNING,
EXITED,
KILLED
};
+ // Default-initialized for convenience. Subprocess::returnCode() will
+ // never produce this value.
+ ProcessReturnCode() : ProcessReturnCode(RV_NOT_STARTED) {}
+
// Trivially copyable
ProcessReturnCode(const ProcessReturnCode& p) = default;
ProcessReturnCode& operator=(const ProcessReturnCode& p) = default;
// Trivially copyable
ProcessReturnCode(const ProcessReturnCode& p) = default;
ProcessReturnCode& operator=(const ProcessReturnCode& p) = default;
@@
-209,7
+215,7
@@
class CalledProcessError : public SubprocessError {
public:
explicit CalledProcessError(ProcessReturnCode rc);
~CalledProcessError() throw() = default;
public:
explicit CalledProcessError(ProcessReturnCode rc);
~CalledProcessError() throw() = default;
- const char* what() const throw()
FOLLY_OVERRIDE
{ return what_.c_str(); }
+ const char* what() const throw()
override
{ return what_.c_str(); }
ProcessReturnCode returnCode() const { return returnCode_; }
private:
ProcessReturnCode returnCode_;
ProcessReturnCode returnCode() const { return returnCode_; }
private:
ProcessReturnCode returnCode_;
@@
-223,7
+229,7
@@
class SubprocessSpawnError : public SubprocessError {
public:
SubprocessSpawnError(const char* executable, int errCode, int errnoValue);
~SubprocessSpawnError() throw() = default;
public:
SubprocessSpawnError(const char* executable, int errCode, int errnoValue);
~SubprocessSpawnError() throw() = default;
- const char* what() const throw()
FOLLY_OVERRIDE
{ return what_.c_str(); }
+ const char* what() const throw()
override
{ return what_.c_str(); }
int errnoValue() const { return errnoValue_; }
private:
int errnoValue() const { return errnoValue_; }
private: