Changeset 0a73148 for src/libcfa/concurrency/monitor

Timestamp:

Jul 13, 2018, 6:36:34 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

6da49249

Parents:

6b8b767 (diff), ae144af (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix conflict

File:

• src/libcfa/concurrency/monitor (modified) (1 diff)

src/libcfa/concurrency/monitor

@@ -138 +138 @@
 
 struct __acceptable_t {
-        __monitor_group_t;
+        inline struct __monitor_group_t;
         bool is_dtor;
 };