Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Retrieval
ManCo
Commits
d016d2de
Commit
d016d2de
authored
7 years ago
by
Gonzalo Bayo
Browse files
Options
Download
Email Patches
Plain Diff
Changed to raw pointers due an WSASTARTUP error on closing apps in Windows
parent
b8db8e47
master
develop
multiInstance
syncXml
1 merge request
!4
Multi instance
Pipeline
#3304
failed with stage
in 16 minutes and 3 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
manco/ZeqManager.cpp
manco/ZeqManager.cpp
+5
-5
manco/ZeqManager.hpp
manco/ZeqManager.hpp
+4
-2
No files found.
manco/ZeqManager.cpp
View file @
d016d2de
...
...
@@ -49,7 +49,7 @@ namespace manco
zeroeq
::
Subscriber
*
ZeqManager
::
subscriber
(
void
)
{
return
_subscriber
.
get
()
;
return
_subscriber
;
}
void
ZeqManager
::
init
(
const
std
::
string
&
session
)
...
...
@@ -60,11 +60,11 @@ namespace manco
return
;
}
_publisher
.
reset
(
new
zeroeq
::
Publisher
(
session
.
empty
(
)
?
zeroeq
::
DEFAULT_SESSION
:
session
)
);
_publisher
=
new
zeroeq
::
Publisher
(
session
.
empty
()
?
zeroeq
::
DEFAULT_SESSION
:
session
);
_subscriber
.
reset
(
new
zeroeq
::
Subscriber
(
session
.
empty
(
)
?
zeroeq
::
DEFAULT_SESSION
:
session
)
);
_subscriber
=
new
zeroeq
::
Subscriber
(
session
.
empty
(
)
?
zeroeq
::
DEFAULT_SESSION
:
session
);
_subscriber
->
subscribe
(
zeroeq
::
gmrv
::
SyncGroup
::
ZEROBUF_TYPE_IDENTIFIER
(
),
...
...
This diff is collapsed.
Click to expand it.
manco/ZeqManager.hpp
View file @
d016d2de
...
...
@@ -38,6 +38,8 @@ namespace manco
MANCO_API
void
init
(
const
std
::
string
&
session
);
MANCO_API
void
destroy
();
MANCO_API
zeroeq
::
Subscriber
*
subscriber
(
void
);
MANCO_API
void
publishChangeColor
(
const
std
::
string
&
key
,
...
...
@@ -103,8 +105,8 @@ namespace manco
bool
_isInit
;
bool
_listen
;
bool
_runThread
;
std
::
unique_ptr
<
zeroeq
::
Subscriber
>
_subscriber
;
std
::
unique_ptr
<
zeroeq
::
Publisher
>
_publisher
;
zeroeq
::
Subscriber
*
_subscriber
;
zeroeq
::
Publisher
*
_publisher
;
std
::
thread
th
;
private:
...
...
This diff is collapsed.
Click to expand it.
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