Skip to content

Commit

Permalink
Merge branch 'dev' into pr12835
Browse files Browse the repository at this point in the history
  • Loading branch information
ktf authored Mar 8, 2024
2 parents b98dafc + 492b260 commit 870e069
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Framework/Core/include/Framework/runDataProcessing.h
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ int mainNoCatch(int argc, char** argv)
}

int callMain(int argc, char** argv, int (*)(int, char**));
char *getIdString(int argc, char** argv);
char* getIdString(int argc, char** argv);

int main(int argc, char** argv)
{
Expand Down
3 changes: 2 additions & 1 deletion Framework/Core/src/runDataProcessing.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ void doBoostException(boost::exception& e, const char*);
void doDPLException(o2::framework::RuntimeErrorRef& ref, char const*);
void doUnknownException(std::string const& s, char const*);

char *getIdString(int argc, char** argv) {
char* getIdString(int argc, char** argv)
{
for (int argi = 0; argi < argc; argi++) {
if (strcmp(argv[argi], "--id") == 0 && argi + 1 < argc) {
return argv[argi + 1];
Expand Down

0 comments on commit 870e069

Please sign in to comment.