Changeset bdfc032 for src/Common

Timestamp:

Feb 4, 2020, 11:35:26 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

eef8dfb

Parents:

aefb247 (diff), 4f7b418 (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:

Merge branch 'master' into dkobets-vector

File:

• src/Common/Stats/Time.h (modified) (3 diffs)

src/Common/Stats/Time.h

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Fri Mar 01 15:14:11 2019
-// Last Modified By :
+// Last Modified By : Andrew Beach
 // Last Modified On :
 // Update Count     :
@@ -41 +41 @@
                                 f();
                         }
+
+                        template<typename ret_t = void, typename func_t, typename... arg_t>
+                        inline ret_t TimeCall(
+                                        const char *, func_t func, arg_t&&... arg) {
+                                return func(std::forward<arg_t>(arg)...);
+                        }
 #               else
                         void StartGlobal();
@@ -59 +65 @@
                                 func();
                         }
+
+                        template<typename ret_t = void, typename func_t, typename... arg_t>
+                        inline ret_t TimeCall(
+                                        const char * name, func_t func, arg_t&&... arg) {
+                                BlockGuard guard(name);
+                                return func(std::forward<arg_t>(arg)...);
+                        }
 #               endif
         }