components/library/opal/patches/opal-05-cxx-fixes.patch

   1 diff -Nurb opal-3.10.10.orig/include/h323/h323ep.h opal-3.10.10/include/h323/h323ep.h
   2 --- opal-3.10.10.orig/include/h323/h323ep.h     2013-02-20 03:18:14.000000000 +0100
   3 +++ opal-3.10.10/include/h323/h323ep.h  2016-07-31 15:45:34.758319854 +0200
   4 @@ -145,7 +145,7 @@
   5        OpalCall & call,                  ///<  Owner of connection
   6        const PString & party,            ///<  Remote party to call
   7        void * userData  = NULL,          ///<  Arbitrary data to pass to connection
   8 -      unsigned int options = NULL,      ///<  options to pass to conneciton
   9 +      unsigned int options = 0,      ///<  options to pass to conneciton
  10        OpalConnection::StringOptions * stringOptions = NULL
  11      );
  12    //@}
  13 diff -Nurb opal-3.10.10.orig/include/opal/manager.h opal-3.10.10/include/opal/manager.h
  14 --- opal-3.10.10.orig/include/opal/manager.h    2013-02-20 03:18:20.000000000 +0100
  15 +++ opal-3.10.10/include/opal/manager.h 2016-07-31 15:45:34.760096740 +0200
  16 @@ -1527,7 +1527,7 @@
  17      PString       defaultDisplayName;
  18
  19      BYTE                     m_defaultMediaTypeOfService;
  20 -    map<OpalMediaType, BYTE> m_mediaTypeOfService;
  21 +    std::map<OpalMediaType, BYTE> m_mediaTypeOfService;
  22
  23      PINDEX        rtpPayloadSizeMax;
  24      PINDEX        rtpPacketSizeMax;
  25 diff -Nurb opal-3.10.10.orig/include/opal/opalmixer.h opal-3.10.10/include/opal/opalmixer.h
  26 --- opal-3.10.10.orig/include/opal/opalmixer.h  2013-02-20 03:18:20.000000000 +0100
  27 +++ opal-3.10.10/include/opal/opalmixer.h       2016-07-31 15:45:34.759809722 +0200
  28 @@ -153,7 +153,7 @@
  29      struct Stream {
  30        virtual ~Stream() { }
  31        virtual void QueuePacket(const RTP_DataFrame & rtp) = 0;
  32 -      queue<RTP_DataFrame> m_queue;
  33 +      std::queue<RTP_DataFrame> m_queue;
  34      };
  35      typedef std::map<Key_T, Stream *> StreamMap_T;
  36
  37 diff -Nurb opal-3.10.10.orig/include/sip/handlers.h opal-3.10.10/include/sip/handlers.h
  38 --- opal-3.10.10.orig/include/sip/handlers.h    2013-02-20 03:18:21.000000000 +0100
  39 +++ opal-3.10.10/include/sip/handlers.h 2016-07-31 15:45:34.760416421 +0200
  40 @@ -164,7 +164,7 @@
  41    int                         m_originalExpireTime;
  42    int                         m_offlineExpireTime;
  43    State                       m_state;
  44 -  queue<State>                m_stateQueue;
  45 +  std::queue<State>           m_stateQueue;
  46    bool                        m_receivedResponse;
  47    PTimer                      m_expireTimer;
  48    SIPURL                      m_proxy;
  49 diff -Nurb opal-3.10.10.orig/include/sip/sipcon.h opal-3.10.10/include/sip/sipcon.h
  50 --- opal-3.10.10.orig/include/sip/sipcon.h      2013-02-20 03:18:21.000000000 +0100
  51 +++ opal-3.10.10/include/sip/sipcon.h   2016-07-31 15:45:34.760509989 +0200
  52 @@ -738,7 +738,7 @@
  53      PRACKMode      m_prackMode;
  54      bool           m_prackEnabled;
  55      unsigned       m_prackSequenceNumber;
  56 -    queue<SIP_PDU> m_responsePackets;
  57 +    std::queue<SIP_PDU> m_responsePackets;
  58      PTimer         m_responseFailTimer;
  59      PTimer         m_responseRetryTimer;
  60      unsigned       m_responseRetryCount;
  61 diff -Nurb opal-3.10.10.orig/plugins/video/common/mpi.cxx opal-3.10.10/plugins/video/common/mpi.cxx
  62 --- opal-3.10.10.orig/plugins/video/common/mpi.cxx      2013-02-20 03:18:05.000000000 +0100
  63 +++ opal-3.10.10/plugins/video/common/mpi.cxx   2016-07-31 15:45:34.865970421 +0200
  64 @@ -132,8 +132,8 @@
  65    // to the desired one or matches it
  66    for (i=0; i < MPIs.size(); i++) {
  67      // we square the value in order to get absolute distances
  68 -    distance = ( abs(MPIs[i].width  - desiredWidth ) *
  69 -                 abs(MPIs[i].height - desiredHeight) );
  70 +    distance = ( abs(int(MPIs[i].width  - desiredWidth)) *
  71 +                 abs(int(MPIs[i].height - desiredHeight)));
  72
  73      if (distance < minDistance) {
  74        minDistance = distance;
  75 diff -Nurb opal-3.10.10.orig/src/opal/manager.cxx opal-3.10.10/src/opal/manager.cxx
  76 --- opal-3.10.10.orig/src/opal/manager.cxx      2013-02-20 03:18:31.000000000 +0100
  77 +++ opal-3.10.10/src/opal/manager.cxx   2016-07-31 15:45:34.774398967 +0200
  78 @@ -1666,7 +1666,7 @@
  79
  80  BYTE OpalManager::GetMediaTypeOfService(const OpalMediaType & type) const
  81  {
  82 -  map<OpalMediaType, BYTE>::const_iterator it = m_mediaTypeOfService.find(type);
  83 +  std::map<OpalMediaType, BYTE>::const_iterator it = m_mediaTypeOfService.find(type);
  84    return it != m_mediaTypeOfService.end() ? it->second : m_defaultMediaTypeOfService;
  85  }
  86