Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Xin Wang
codes-dev
Commits
07e39f08
Commit
07e39f08
authored
Jan 16, 2015
by
Jonathan Jenkins
Browse files
fix linker error in certain cases with codes-base
same var name used for the "sequencing" macros
parent
44561ddd
Changes
2
Hide whitespace changes
Inline
Side-by-side
codes/model-net.h
View file @
07e39f08
...
...
@@ -26,14 +26,14 @@
* feasible for now (would basically have to redesign model-net), so expose
* explicit start-sequence and stop-sequence markers as a workaround
*/
extern
int
in_seq
u
ence
;
extern
int
mn_
in_seqence
;
extern
tw_stime
mn_msg_offset
;
#define MN_START_SEQ() do {\
in_seq
u
ence = 1; \
mn_
in_seqence = 1; \
mn_msg_offset = 0.0; \
} while (0)
#define MN_END_SEQ() do {\
in_seq
u
ence = 0;\
mn_
in_seqence = 0;\
} while (0)
...
...
src/models/networks/model-net/model-net.c
View file @
07e39f08
...
...
@@ -43,7 +43,7 @@ struct model_net_method* method_array[] = {
#undef X
// counter and offset for the MN_START_SEQ / MN_END_SEQ macros
int
in_seq
u
ence
=
0
;
int
mn_
in_seqence
=
0
;
tw_stime
mn_msg_offset
=
0
.
0
;
// message parameters for use via model_net_set_msg_param
...
...
@@ -248,7 +248,7 @@ static void model_net_event_impl_base(
tw_lpid
mn_lp
=
model_net_find_local_device
(
net_id
,
annotation
,
ignore_annotations
,
sender
->
gid
);
tw_stime
poffset
=
codes_local_latency
(
sender
);
if
(
in_seq
u
ence
){
if
(
mn_
in_seqence
){
tw_stime
tmp
=
mn_msg_offset
;
mn_msg_offset
+=
poffset
;
poffset
+=
tmp
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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