Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Guillaume Baulieu
agapro
Commits
58961190
Commit
58961190
authored
May 29, 2018
by
Jérémie Dudouet
Browse files
Correction of bad check of root and mfm dependancies in the TreeBuilder actor
parent
19c835c4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
4 deletions
+15
-4
WinCtest/femul.cpp
WinCtest/femul.cpp
+9
-3
consumers/CMakeLists.txt
consumers/CMakeLists.txt
+1
-1
consumers/TreeBuilder/libAGAPRO_TreeBuilder.cpp
consumers/TreeBuilder/libAGAPRO_TreeBuilder.cpp
+5
-0
No files found.
WinCtest/femul.cpp
View file @
58961190
...
...
@@ -110,9 +110,10 @@ DISPATCHER BuilderName pseudo actor to connect the output of a chain to an i
#ifdef HAS_ROOT
#include "AGAPRO_TreeBuilder.h"
#include "AGAPRO_TB_AgNedDiam.h"
#ifdef HAS_MFM
#include "AGAPRO_TB_AgNedDiam.h" // 42 420
#endif
#endif
// TB_AgNedDiam // 42 420
// 5 DISPATCHER femul mechanism to connect to an EventBuilder
// BuilderName // 50 destination_chain
...
...
@@ -870,10 +871,11 @@ void listKeysAndExit()
pf6
->
GetParameters
(
""
,
true
);
delete
pf6
;
#if defined(HAS_MFM) && defined(HAS_ROOT)
AGAPRO
::
TB_AgNedDiam
*
pf7
=
new
AGAPRO
::
TB_AgNedDiam
;
pf7
->
GetParameters
(
""
,
true
);
delete
pf7
;
#endif
exit
(
EXIT_SUCCESS
);
}
...
...
@@ -1118,6 +1120,7 @@ bool topologyConfNew()
pActor
->
libItem
=
400
;
}
// 42
#if defined(HAS_MFM) && defined(HAS_ROOT)
else
if
(
pActor
->
libName
==
"TB_AgNedDiam"
)
{
// no mother-daughter model
cout
<<
"TB_AgNedDiam ..."
<<
endl
;
AGAPRO
::
TB_AgNedDiam
::
process_config
(
pActor
->
libConf
.
c_str
(),
&
error_config
);
...
...
@@ -1125,6 +1128,7 @@ bool topologyConfNew()
pActor
->
nrvPointer
=
new
AGAPRO
::
TB_AgNedDiam
;
pActor
->
libItem
=
420
;
}
#endif
ELSE_UNKNOWNCLASS
(
nc
);
break
;
case
DISPATCHER
:
//// 5 // not a narval actor
...
...
@@ -1389,6 +1393,7 @@ bool topologyConfNew()
pActor
->
nrvPointer
=
new
BasicAFC
(
nc
);
pActor
->
libItem
=
1
;
}
#if defined(HAS_MFM) && defined(HAS_ROOT)
else
if
(
pActor
->
libName
==
"TB_AgNedDiam"
)
{
cout
<<
"TB_AgNedDiam ..."
<<
endl
;
BasicAFC
::
process_config
(
pActor
->
libConf
.
c_str
(),
&
error_config
);
...
...
@@ -1396,6 +1401,7 @@ bool topologyConfNew()
pActor
->
nrvPointer
=
new
TB_AgNedDiam
;
pActor
->
libItem
=
1
;
}
#endif
else
{
cout
<<
"Unknown class [ "
<<
nc
<<
" "
<<
nc
<<
" ] "
<<
pActor
->
libName
<<
endl
;
return
false
;
...
...
consumers/CMakeLists.txt
View file @
58961190
...
...
@@ -7,6 +7,6 @@ MESSAGE("[AGAPRO] + ${PROJECT_NAME}")
add_subdirectory
(
Basic
)
if
(
ROOT_FOUND
AND MFM_FOUND
)
if
(
ROOT_FOUND
)
add_subdirectory
(
TreeBuilder
)
endif
()
consumers/TreeBuilder/libAGAPRO_TreeBuilder.cpp
View file @
58961190
#include "AGAPRO_TreeBuilder.h"
#ifdef HAS_MFM
#include "AGAPRO_TB_AgNedDiam.h"
#endif
using
namespace
AGAPRO
;
...
...
@@ -9,9 +12,11 @@ extern "C" {
if
(
(
TreeBuilder
::
gActualClass
.
size
()
==
0
)
||
(
TreeBuilder
::
gActualClass
==
"basic"
)
)
{
return
new
TreeBuilder
();
}
#ifdef HAS_MFM
else
if
(
TreeBuilder
::
gActualClass
==
"TB_AgNedDiam"
)
{
return
new
TB_AgNedDiam
();
}
#endif
else
{
std
::
cout
<<
"
\n
ERROR : TreeBuilder::gActualClass "
<<
TreeBuilder
::
gActualClass
<<
" not recognised
\n
"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment