Ticket #35949: patch-boost-1.50.diff

File patch-boost-1.50.diff, 4.2 KB (added by ryandesign (Ryan Carsten Schmidt), 12 years ago)

  • source/backend/scene/view.cpp

    old new  
    15501550        }
    15511551
    15521552        boost::xtime t;
    1553         boost::xtime_get (&t, boost::TIME_UTC);
     1553        boost::xtime_get (&t, boost::TIME_UTC_);
    15541554        t.sec += 3;
    15551555
    15561556        // this will cause us to wait until the other threads are done.

  • source/base/timer.cpp

    old new  
    117117POV_LONG TimerDefault::ElapsedRealTime() const
    118118{
    119119        boost::xtime t;
    120         boost::xtime_get(&t, boost::TIME_UTC);
     120        boost::xtime_get(&t, boost::TIME_UTC_);
    121121        POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec);
    122122        POV_LONG st = (POV_LONG)(realTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(realTimeStart.nsec);
    123123        return ((tt - st) / (POV_LONG)(1000000));
    … …  
    126126POV_LONG TimerDefault::ElapsedCPUTime() const
    127127{
    128128        boost::xtime t;
    129         boost::xtime_get(&t, boost::TIME_UTC);
     129        boost::xtime_get(&t, boost::TIME_UTC_);
    130130        POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec);
    131131        POV_LONG st = (POV_LONG)(cpuTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(cpuTimeStart.nsec);
    132132        return ((tt - st) / (POV_LONG)(1000000));
    … …  
    139139
    140140void TimerDefault::Reset()
    141141{
    142         boost::xtime_get(&realTimeStart, boost::TIME_UTC);
    143         boost::xtime_get(&cpuTimeStart, boost::TIME_UTC);
     142        boost::xtime_get(&realTimeStart, boost::TIME_UTC_);
     143        boost::xtime_get(&cpuTimeStart, boost::TIME_UTC_);
    144144}
    145145
    146146}
    … …  
    155155void Delay(unsigned int msec)
    156156{
    157157        boost::xtime t;
    158         boost::xtime_get(&t, boost::TIME_UTC);
     158        boost::xtime_get(&t, boost::TIME_UTC_);
    159159        POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000);
    160160        t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000));
    161161        t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000));

  • vfe/unix/platformbase.cpp

    old new  
    126126#else
    127127                // taken from source/base/timer.cpp
    128128                boost::xtime t;
    129                 boost::xtime_get(&t, boost::TIME_UTC);
     129                boost::xtime_get(&t, boost::TIME_UTC_);
    130130                POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000);
    131131                t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000));
    132132                t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000));

  • vfe/vfepovms.cpp

    old new  
    247247
    248248    // TODO: have a shorter wait but loop, and check for system shutdown
    249249    boost::xtime t;
    250     boost::xtime_get (&t, boost::TIME_UTC);
     250    boost::xtime_get (&t, boost::TIME_UTC_);
    251251    t.nsec += 50000000 ;
    252252    m_Event.timed_wait (lock, t);
    253253

  • vfe/vfesession.cpp

    old new  
    967967  if (WaitTime > 0)
    968968  {
    969969    boost::xtime t;
    970     boost::xtime_get (&t, boost::TIME_UTC);
     970    boost::xtime_get (&t, boost::TIME_UTC_);
    971971    t.sec += WaitTime / 1000 ;
    972972    t.nsec += (WaitTime % 1000) * 1000000 ;
    973973    m_SessionEvent.timed_wait (lock, t);
    … …  
    10341034  // we can't call pause directly since it will result in a thread context
    10351035  // error. pause must be called from the context of the worker thread.
    10361036  boost::xtime t;
    1037   boost::xtime_get (&t, boost::TIME_UTC);
     1037  boost::xtime_get (&t, boost::TIME_UTC_);
    10381038  t.sec += 3 ;
    10391039  m_RequestFlag = rqPauseRequest;
    10401040  if (m_RequestEvent.timed_wait(lock, t) == false)
    … …  
    10571057  // we can't call resume directly since it will result in a thread context
    10581058  // error. it must be called from the context of the worker thread.
    10591059  boost::xtime t;
    1060   boost::xtime_get (&t, boost::TIME_UTC);
     1060  boost::xtime_get (&t, boost::TIME_UTC_);
    10611061  t.sec += 3 ;
    10621062  m_RequestFlag = rqResumeRequest;
    10631063  if (m_RequestEvent.timed_wait(lock, t) == false)
    … …  
    11231123  m_LastError = vfeNoError;
    11241124
    11251125  boost::xtime t;
    1126   boost::xtime_get (&t, boost::TIME_UTC);
     1126  boost::xtime_get (&t, boost::TIME_UTC_);
    11271127  t.sec += 3 ;
    11281128#ifdef _DEBUG
    11291129  t.sec += 120;