Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V8_0_0_BR'
[modules/kernel.git]
/
src
/
Launcher
/
Launcher_XML_Persistence.hxx
diff --git
a/src/Launcher/Launcher_XML_Persistence.hxx
b/src/Launcher/Launcher_XML_Persistence.hxx
index 133a21bb4c02796d96967b7fdb46bb04b63dcb17..57e464cd65ee4b05d5e30ae92517c48a482707f9 100644
(file)
--- a/
src/Launcher/Launcher_XML_Persistence.hxx
+++ b/
src/Launcher/Launcher_XML_Persistence.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-56,7
+56,7
@@
namespace Launcher
static Job * createJobFromXmlNode(xmlNodePtr job_node);
static void parseUserNode(Job * new_job, xmlNodePtr user_node);
static void parseRunNode(Job * new_job, xmlNodePtr run_node);
static Job * createJobFromXmlNode(xmlNodePtr job_node);
static void parseUserNode(Job * new_job, xmlNodePtr user_node);
static void parseRunNode(Job * new_job, xmlNodePtr run_node);
- static
resourceParams parseResourceNode(
xmlNodePtr res_node);
+ static
void parseResourceNode(Job * new_job,
xmlNodePtr res_node);
// Useful wrappers around libxml2 functions
// Useful wrappers around libxml2 functions