Commit 748186e5 authored by Ivan Donchevskiy's avatar Ivan Donchevskiy

Fixes by lav

parent 8dc14337
......@@ -1267,7 +1267,7 @@ void MBTCPMaster::initIterators()
}
// -----------------------------------------------------------------------------
void MBTCPMaster::help_print( int argc, const char** argv )
void MBTCPMaster::help_print( int argc, const char* const* argv )
{
cout << "--mbm-polltime msec - . 200 ." << endl;
cout << "--mbm-heartbeat-id - heartbeat-." << endl;
......@@ -1283,7 +1283,7 @@ void MBTCPMaster::help_print( int argc, const char** argv )
cout << "--mbm-recv-timeout - ." << endl;
}
// -----------------------------------------------------------------------------
MBTCPMaster* MBTCPMaster::init_mbmaster( int argc, const char** argv, UniSetTypes::ObjectId icID, SharedMemory* ic,
MBTCPMaster* MBTCPMaster::init_mbmaster( int argc, const char* const* argv, UniSetTypes::ObjectId icID, SharedMemory* ic,
const std::string prefix )
{
string name = conf->getArgParam("--" + prefix + "-name","MBTCPMaster1");
......
......@@ -30,12 +30,12 @@ class MBTCPMaster:
virtual ~MBTCPMaster();
/*! */
static MBTCPMaster* init_mbmaster( int argc, const char** argv,
static MBTCPMaster* init_mbmaster( int argc, const char* const* argv,
UniSetTypes::ObjectId shmID, SharedMemory* ic=0,
const std::string prefix="mbtcp" );
/*! help- */
static void help_print( int argc, const char** argv );
static void help_print( int argc, const char* const* argv );
static const int NoSafetyState=-1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment