Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/InvictusInnovations/fc

Browse source
This commit is contained in:
Vikram Rajkumar 2014-07-03 17:24:14 -04:00
commit c9c56ffbb6
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/fc/interprocess/iprocess.hpp
View file

@ -32,7 +32,7 @@ namespace fc
* @return *this * @return *this
*/ */
virtual iprocess& exec( const path& exe, std::vector<std::string> args, 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 * @return blocks until the process exits

2
include/fc/interprocess/process.hpp
View file

@ -18,7 +18,7 @@ namespace fc {
virtual iprocess& exec( const fc::path& exe, virtual iprocess& exec( const fc::path& exe,
std::vector<std::string> args, std::vector<std::string> args,
const fc::path& work_dir = fc::path(), const fc::path& work_dir = fc::path(),
exec_opts opts = open_all ); int opts = open_all );
virtual int result(const microseconds& timeout = microseconds::maximum()); virtual int result(const microseconds& timeout = microseconds::maximum());

2
src/interprocess/process.cpp
View file

@ -74,7 +74,7 @@ process::~process(){}
iprocess& process::exec( const fc::path& exe, iprocess& process::exec( const fc::path& exe,
std::vector<std::string> args, 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(); my->pctx.work_dir = work_dir.string();