Merge branch 'master' of https://github.com/InvictusInnovations/fc
This commit is contained in:
commit
c9c56ffbb6
3 changed files with 3 additions and 3 deletions
|
|
@ -32,7 +32,7 @@ namespace fc
|
|||
* @return *this
|
||||
*/
|
||||
virtual iprocess& exec( const path& exe, std::vector<std::string> args,
|
||||
const path& work_dir = path(), exec_opts opts = open_all ) = 0;
|
||||
const path& work_dir = path(), int opts = open_all ) = 0;
|
||||
|
||||
/**
|
||||
* @return blocks until the process exits
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ namespace fc {
|
|||
virtual iprocess& exec( const fc::path& exe,
|
||||
std::vector<std::string> args,
|
||||
const fc::path& work_dir = fc::path(),
|
||||
exec_opts opts = open_all );
|
||||
int opts = open_all );
|
||||
|
||||
|
||||
virtual int result(const microseconds& timeout = microseconds::maximum());
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ process::~process(){}
|
|||
|
||||
iprocess& process::exec( const fc::path& exe,
|
||||
std::vector<std::string> args,
|
||||
const fc::path& work_dir, exec_opts opt )
|
||||
const fc::path& work_dir, int opt )
|
||||
{
|
||||
|
||||
my->pctx.work_dir = work_dir.string();
|
||||
|
|
|
|||
Loading…
Reference in a new issue