event.cc (13086:6a6fa249add7) event.cc (13127:d3318222cf09)
1/*
2 * Copyright 2018 Google, Inc.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are
6 * met: redistributions of source code must retain the above copyright
7 * notice, this list of conditions and the following disclaimer;
8 * redistributions in binary form must reproduce the above copyright

--- 47 unchanged lines hidden (view full) ---

56
57 if (p)
58 parent = p->obj()->sc_obj();
59 else if (scheduler.current())
60 parent = scheduler.current();
61 else
62 parent = nullptr;
63
1/*
2 * Copyright 2018 Google, Inc.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are
6 * met: redistributions of source code must retain the above copyright
7 * notice, this list of conditions and the following disclaimer;
8 * redistributions in binary form must reproduce the above copyright

--- 47 unchanged lines hidden (view full) ---

56
57 if (p)
58 parent = p->obj()->sc_obj();
59 else if (scheduler.current())
60 parent = scheduler.current();
61 else
62 parent = nullptr;
63
64 pickUniqueName(parent, _basename);
65
64 if (parent) {
65 Object *obj = Object::getFromScObject(parent);
66 obj->addChildEvent(_sc_event);
67 } else {
68 topLevelEvents.emplace(topLevelEvents.end(), _sc_event);
69 }
70
71 if (parent)

--- 107 unchanged lines hidden --- 		66 if (parent) {
67 Object *obj = Object::getFromScObject(parent);
68 obj->addChildEvent(_sc_event);
69 } else {
70 topLevelEvents.emplace(topLevelEvents.end(), _sc_event);
71 }
72
73 if (parent)

--- 107 unchanged lines hidden ---