Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 182009 | Differences between
and this patch

Collapse All | Expand All

(-)fex-0.8.18/src/client.cpp (-1 / +1 lines)
Lines 53-59 Link Here
53 
{
 53 
{
54 
  lc.info("start fullsync");
 54 
  lc.info("start fullsync");
55 
  parent().write(fex_header(ME_FullSyncStart));
 55 
  parent().write(fex_header(ME_FullSyncStart));
56 
  parent().wp()->createStateFile((unsigned)this, &_M_ClientFile);
 56 
  parent().wp()->createStateFile((unsigned long)this, &_M_ClientFile);
57 
}
 57 
}
58 
void FullSyncDialog::
 58 
void FullSyncDialog::
(-)fex-0.8.18/src/dialog.cpp (-1 / +1 lines)
Lines 224-230 Link Here
224 
  ModLog::iterator i;
 224 
  ModLog::iterator i;
225 
  for(i = _M_Log.begin(); i != _M_Log.end(); i++) {
 225 
  for(i = _M_Log.begin(); i != _M_Log.end(); i++) {
226 
    if (! FileListener::get().lock(parent().wp()->path() + i->first.str(),
 226 
    if (! FileListener::get().lock(parent().wp()->path() + i->first.str(),
227 
                                  (unsigned int)&parent())) {
 227 
                                  (unsigned long)&parent())) {
228 
      ModLog::iterator j;
 228 
      ModLog::iterator j;
229 
      for(j = _M_Log.begin(); j != i; j++) {
 229 
      for(j = _M_Log.begin(); j != i; j++) {
230 
       FileListener::get().unlock(parent().wp(),
 230 
       FileListener::get().unlock(parent().wp(),
(-)fex-0.8.18/src/filelistener.cpp (-2 / +2 lines)
Lines 355-361 Link Here
355 
  _M_FDBuffer[0].reserve(MinFDBufferSize);
 355 
  _M_FDBuffer[0].reserve(MinFDBufferSize);
356 
  _M_FDBuffer[1].reserve(MinFDBufferSize);
 356 
  _M_FDBuffer[1].reserve(MinFDBufferSize);
357 
  _S_SignalBuffer = (int)&_M_FDBuffer[0];
 357 
  _S_SignalBuffer = (long)&_M_FDBuffer[0];
358 
  _M_ReadBuffer   = &_M_FDBuffer[1];
 358 
  _M_ReadBuffer   = &_M_FDBuffer[1];
359 
  assert(! _S_WakeUpPipe.first);
 359 
  assert(! _S_WakeUpPipe.first);
Lines 439-445 Link Here
439 
  typedef FileListener::FileEvent::reqs_m::iterator iterator;
 439 
  typedef FileListener::FileEvent::reqs_m::iterator iterator;
440 
  _M_ReadBuffer->reserve(_M_Handler->size() + MinFDBufferSize);
 440 
  _M_ReadBuffer->reserve(_M_Handler->size() + MinFDBufferSize);
441 
  _S_SignalBuffer = (int)_M_ReadBuffer;
 441 
  _S_SignalBuffer = (long)_M_ReadBuffer;
442 
  _M_ReadBuffer   = &_M_FDBuffer[_M_ReadBuffer == &_M_FDBuffer[0] ? 1 : 0];
 442 
  _M_ReadBuffer   = &_M_FDBuffer[_M_ReadBuffer == &_M_FDBuffer[0] ? 1 : 0];
443 
  if (_S_RenewAll) {
 443 
  if (_S_RenewAll) {
(-)fex-0.8.18/src/nmstl/netioevent (-2 / +2 lines)
Lines 138-144 Link Here
138 
    io_handler::set_ioh;
 138 
    io_handler::set_ioh;
139 
private:
 139 
private:
140 
    inline void tcp_acceptor::ravail() {
 140 
    inline void ravail() {
141 
        address a;
 141 
        address a;
142 
        tcpsocket ioh = sock.accept(a);
 142 
        tcpsocket ioh = sock.accept(a);
143 
        if (ioh) {
 143 
        if (ioh) {
Lines 168-174 Link Here
168 
    virtual ~tcp_acceptor() {}
 168 
    virtual ~tcp_acceptor() {}
169 
protected:
 169 
protected:
170 
    inline void tcp_acceptor::ravail() {
 170 
    inline void ravail() {
171 
        address a;
 171 
        address a;
172 
        tcpsocket ioh = sock.accept(a);
 172 
        tcpsocket ioh = sock.accept(a);
173 
        if (ioh) {
 173 
        if (ioh) {
(-)fex-0.8.18/src/server.cpp (-1 / +1 lines)
Lines 81-87 Link Here
81 
sendStatFile()
 81 
sendStatFile()
82 
{
 82 
{
83 
  size_t size;
 83 
  size_t size;
84 
  size = parent().wp()->createStateFile((unsigned)this, &_M_StateFile);
 84 
  size = parent().wp()->createStateFile((unsigned long)this, &_M_StateFile);
85 
  omessage msg;
 85 
  omessage msg;
86 
  msg << _M_StateFile << size;
 86 
  msg << _M_StateFile << size;
87 
  write(fex_header(ME_FullSyncState), msg);
 87 
  write(fex_header(ME_FullSyncState), msg);
(-)fex-0.8.18/src/watchpoint.cpp (-2 / +2 lines)
Lines 188-194 Link Here
188 
        unsigned int lock_id,
 188 
        unsigned int lock_id,
189 
        bool do_sync)
 189 
        bool do_sync)
190 
{
 190 
{
191 
  if (lock_id == (unsigned int)this)
 191 
  if (lock_id == (unsigned long)this)
192 
    return;
 192 
    return;
193 
  pair<ModLog::iterator, bool> res = _M_WriteLog->insert(key, state);
 193 
  pair<ModLog::iterator, bool> res = _M_WriteLog->insert(key, state);
Lines 327-333 Link Here
327 
save_state()
 327 
save_state()
328 
{
 328 
{
329 
  if (_M_Mode >= MO_fullsynched)
 329 
  if (_M_Mode >= MO_fullsynched)
330 
    wp()->createStateFile((unsigned)this, NULL);
 330 
    wp()->createStateFile((unsigned long)this, NULL);
331 
}
 331 
}

Return to bug 182009