Skip to content
Snippets Groups Projects
Commit 409c95c8 authored by Sven Duscha's avatar Sven Duscha
Browse files

task #2927 fixed basename function namespace confusion with libgen.h occuring on some machines

parent e85bc199
No related branches found
No related tags found
No related merge requests found
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <LMWCommon/VdsDesc.h> #include <LMWCommon/VdsDesc.h>
#include <Common/LofarLogger.h> #include <Common/LofarLogger.h>
#include <Common/StreamUtil.h> #include <Common/StreamUtil.h>
#include <Common/SystemUtil.h>
#include <casa/BasicMath/Math.h> #include <casa/BasicMath/Math.h>
#include <unistd.h> #include <unistd.h>
...@@ -61,7 +62,7 @@ int run(const ParameterSet &options, const OptionParser::ArgumentList &args); ...@@ -61,7 +62,7 @@ int run(const ParameterSet &options, const OptionParser::ArgumentList &args);
// Application entry point. // Application entry point.
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
const char* progName = basename(argv[0]); const string progName = LOFAR::basename(argv[0]);
INIT_LOGGER(progName); INIT_LOGGER(progName);
LOG_INFO_STR(Version::getInfo<BBSControlVersion>(progName, "other")); LOG_INFO_STR(Version::getInfo<BBSControlVersion>(progName, "other"));
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <BBSKernel/ParmManager.h> #include <BBSKernel/ParmManager.h>
#include <Common/LofarLogger.h> #include <Common/LofarLogger.h>
#include <Common/StreamUtil.h> #include <Common/StreamUtil.h>
#include <Common/SystemUtil.h>
#ifdef HAVE_PQXX #ifdef HAVE_PQXX
#include <BBSControl/CalSession.h> #include <BBSControl/CalSession.h>
...@@ -58,7 +59,7 @@ int runDistributed(const ParameterSet &options, ...@@ -58,7 +59,7 @@ int runDistributed(const ParameterSet &options,
// Application entry point. // Application entry point.
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
const char* progName = basename(argv[0]); const string progName = LOFAR::basename(argv[0]);
INIT_LOGGER(progName); INIT_LOGGER(progName);
LOG_INFO_STR(Version::getInfo<BBSControlVersion>(progName, "other")); LOG_INFO_STR(Version::getInfo<BBSControlVersion>(progName, "other"));
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
//# $Id: //# $Id:
#include <lofar_config.h> #include <lofar_config.h>
#include <Common/SystemUtil.h>
#include <BBSControl/Package__Version.h> #include <BBSControl/Package__Version.h>
#include <BBSControl/CalSession.h> #include <BBSControl/CalSession.h>
#include <BBSControl/CommandHandlerEstimator.h> #include <BBSControl/CommandHandlerEstimator.h>
...@@ -39,7 +40,7 @@ int run(const ParameterSet &options, const OptionParser::ArgumentList &args); ...@@ -39,7 +40,7 @@ int run(const ParameterSet &options, const OptionParser::ArgumentList &args);
// Application entry point. // Application entry point.
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
const char* progName = basename(argv[0]); const string progName = LOFAR::basename(argv[0]);
INIT_LOGGER(progName); INIT_LOGGER(progName);
LOG_INFO_STR(Version::getInfo<BBSControlVersion>(progName, "other")); LOG_INFO_STR(Version::getInfo<BBSControlVersion>(progName, "other"));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment