coreclr-git: Eliminate merged patch

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Feb 6 05:21:46 2016 +0100
Changeset:	33cb9252c3b7fd3f6b3afd74d57a1ba1110cb122

Modified Files:
	coreclr-git/distinfo
	coreclr-git/patches/patch-src_pal_src_synchmgr_synchmanager.hpp

Log Message:
coreclr-git: Eliminate merged patch

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=33cb9252c3b7fd3f6b3afd74d57a1ba1110cb122

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 coreclr-git/distinfo                               |  2 +-
 .../patch-src_pal_src_synchmgr_synchmanager.hpp    | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 18c7a17..a57654e 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -5,5 +5,5 @@ SHA1 (patch-src_pal_src_CMakeLists.txt) = 1a8b4d357578a851306c6930f8de1b7e64eeab
 SHA1 (patch-src_pal_src_debug_debug.cpp) = 0d6bee5d2896de64effafa01d2e2989de82c76fc
 SHA1 (patch-src_pal_src_exception_seh-unwind.cpp) = 3a0c587cf9a4f00a0da2cd7a7a59a24b330e1f3d
 SHA1 (patch-src_pal_src_exception_signal.cpp) = ba0cabad71792a0108ffd9ec29254751f1e95997
-SHA1 (patch-src_pal_src_synchmgr_synchmanager.hpp) = 54696c8ee6a10bfa9858e3145b552c56c58dfbbf
+SHA1 (patch-src_pal_src_synchmgr_synchmanager.hpp) = a009d45632a8bcbf422a68d1b2bd1b3d9c1b6cce
 SHA1 (patch-src_pal_src_thread_context.cpp) = c982763c5b6c9905fd1f14b1271baae5a2fbf052
diff --git a/coreclr-git/patches/patch-src_pal_src_synchmgr_synchmanager.hpp b/coreclr-git/patches/patch-src_pal_src_synchmgr_synchmanager.hpp
index 37e46a1..8cccddf 100644
--- a/coreclr-git/patches/patch-src_pal_src_synchmgr_synchmanager.hpp
+++ b/coreclr-git/patches/patch-src_pal_src_synchmgr_synchmanager.hpp
@@ -1,29 +1,29 @@
 $NetBSD$
 
---- src/pal/src/synchmgr/synchmanager.hpp.orig	2016-01-28 19:04:13.000000000 +0000
+--- src/pal/src/synchmgr/synchmanager.hpp.orig	2016-02-06 04:19:55.000000000 +0000
 +++ src/pal/src/synchmgr/synchmanager.hpp
-@@ -452,6 +452,7 @@ namespace CorUnix
+@@ -452,7 +452,6 @@ namespace CorUnix
          
      public:
          CSynchWaitController() : m_pProcLocalData(NULL) {}
-+        virtual ~CSynchWaitController() = default;
+-        virtual ~CSynchWaitController() = default;
          
          //
          // ISynchWaitController methods
-@@ -479,8 +480,9 @@ namespace CorUnix
+@@ -480,9 +479,8 @@ namespace CorUnix
      {
      public:
          // NB: For perforformance purposes this class is supposed
--        //     to have no constructor or destructor
--        
-+        //     to have no constructor
-+        virtual ~CSynchStateController() = default;
-+
+-        //     to have no constructor
+-        virtual ~CSynchStateController() = default;
+-
++        //     to have no constructor or destructor
++        
          //
          // ISynchStateController methods
          //
-@@ -1021,4 +1023,3 @@ namespace CorUnix
+@@ -1023,3 +1021,4 @@ namespace CorUnix
  }
  
  #endif // _SINCHMANAGER_HPP_
--
++