[med-svn] [dcmtk] 01/01: merge conflicts in upstream

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch upstream
in repository dcmtk.

commit d433845f998060b2d62892b384365fe9eae6cca8
Merge: b9ded7c e8ca983
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Mon Mar 6 10:52:09 2017 +0000

    merge conflicts in upstream

 dcmnet/libsrc/dstorscu.cc  |   2 +
 dcmpmap/tests/Makefile.dep | 548 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 550 insertions(+)

diff --cc dcmnet/libsrc/dstorscu.cc
index 4cd7acf,c93f175..a8863fb
--- a/dcmnet/libsrc/dstorscu.cc
+++ b/dcmnet/libsrc/dstorscu.cc
@@@ -927,8 -927,10 +927,10 @@@ OFCondition DcmStorageSCU::sendSOPInsta
  }
  
  
 -void DcmStorageSCU::notifySOPInstanceToBeSent(const TransferEntry &transferEntry)
 +void DcmStorageSCU::notifySOPInstanceToBeSent(const TransferEntry & /*transferEntry*/)
  {
+     // avoid compiler warning
+     (void)transferEntry;
      // do nothing in the default implementation
  }
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dcmtk.git