commit 1c11253f621eee0c66c41e2e7a074fde230e3bf2
author William Hesse <whesse@google.com> Mon Jun 06 23:01:43 2016 +0200
committer William Hesse <whesse@google.com> Mon Jun 06 23:01:43 2016 +0200
tree 73e447199c13d6a0d9c3a5bb75e126134cb2d3c0
parent 221f37b0db4ed08376509727869780f764deef40

Version 1.17.1

Fix broken merge of dev 1.17.0-dev.6.4 to stable 1.17.0.

runtime/vm/os_thread.h

diff --git a/runtime/vm/os_thread.h b/runtime/vm/os_thread.h
index 414faae..415cff89 100644
--- a/runtime/vm/os_thread.h
+++ b/runtime/vm/os_thread.h
@@ -173,10 +173,6 @@
   // called when the retunred id will eventually be passed to OSThread::Join().
   static ThreadJoinId GetCurrentThreadJoinId(OSThread* thread);
 
-  // This function can be called only once per OSThread, and should only be
-  // called when the retunred id will eventually be passed to OSThread::Join().
-  static ThreadJoinId GetCurrentThreadJoinId(OSThread* thread);
-
   // Called at VM startup and shutdown.
   static void InitOnce();