Attachment #179382 for bug #251444

View | Details | Raw Unified | Return to bug 251444
Collapse All | Expand All

Lines 53-59 Link Here

(-)fex-0.8.18-orig/src/client.cpp (-1 / +1 lines)
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		58
59	void FullSyncDialog::	59	void FullSyncDialog::

Lines 224-230 Link Here

(-)fex-0.8.18-orig/src/dialog.cpp (-1 / +1 lines)
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(),

Lines 355-361 Link Here

(-)fex-0.8.18-orig/src/filelistener.cpp (-2 / +2 lines)
355		355
356	_M_FDBuffer[0].reserve(MinFDBufferSize);	356	_M_FDBuffer[0].reserve(MinFDBufferSize);
357	_M_FDBuffer[1].reserve(MinFDBufferSize);	357	_M_FDBuffer[1].reserve(MinFDBufferSize);
358	_S_SignalBuffer = (int)&_M_FDBuffer[0];	358	_S_SignalBuffer = (long)&_M_FDBuffer[0];
359	_M_ReadBuffer = &_M_FDBuffer[1];	359	_M_ReadBuffer = &_M_FDBuffer[1];
360		360
361	assert(! _S_WakeUpPipe.first);	361	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		440
441	_M_ReadBuffer->reserve(_M_Handler->size() + MinFDBufferSize);	441	_M_ReadBuffer->reserve(_M_Handler->size() + MinFDBufferSize);
442	_S_SignalBuffer = (int)_M_ReadBuffer;	442	_S_SignalBuffer = (long)_M_ReadBuffer;
443	_M_ReadBuffer = &_M_FDBuffer[_M_ReadBuffer == &_M_FDBuffer[0] ? 1 : 0];	443	_M_ReadBuffer = &_M_FDBuffer[_M_ReadBuffer == &_M_FDBuffer[0] ? 1 : 0];
444		444
445	if (_S_RenewAll) {	445	if (_S_RenewAll) {

Lines 138-144 Link Here

(-)fex-0.8.18-orig/src/nmstl/netioevent (-2 / +2 lines)
138	io_handler::set_ioh;	138	io_handler::set_ioh;
139		139
140	private:	140	private:
141	inline void tcp_acceptor::ravail() {	141	inline void ravail() {
142	address a;	142	address a;
143	tcpsocket ioh = sock.accept(a);	143	tcpsocket ioh = sock.accept(a);
144	if (ioh) {	144	if (ioh) {
Lines 168-174 Link Here
168	virtual ~tcp_acceptor() {}	168	virtual ~tcp_acceptor() {}
169		169
170	protected:	170	protected:
171	inline void tcp_acceptor::ravail() {	171	inline void ravail() {
172	address a;	172	address a;
173	tcpsocket ioh = sock.accept(a);	173	tcpsocket ioh = sock.accept(a);
174	if (ioh) {	174	if (ioh) {

Lines 81-87 Link Here

(-)fex-0.8.18-orig/src/server.cpp (-1 / +1 lines)
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);

Lines 188-194 Link Here

(-)fex-0.8.18-orig/src/watchpoint.cpp (-2 / +2 lines)
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		193
194	pair<ModLog::iterator, bool> res = _M_WriteLog->insert(key, state);	194	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	}
332		332
333		333

Lines 20-26 Link Here

(-)fex-0.8.18b/src/nmstl_src/debug.cc (-1 / +2 lines)
20	*	20	*
21	*/	21	*/
22		22
23	#include <iostream>	23	#include <cstdlib>
		24	#include <cstring>
24		25
25	#include <nmstl/debug>	26	#include <nmstl/debug>
26	#include <nmstl/thread>	27	#include <nmstl/thread>

Lines 21-26 Link Here

(-)fex-0.8.18b/src/nmstl_src/internal.cc (+1 lines)
21	*/	21	*/
22		22
23	#include <nmstl/internal.h>	23	#include <nmstl/internal.h>
		24	#include <cstdlib>
24		25
25	#undef NMSTL_DEBUG_FILE_H	26	#undef NMSTL_DEBUG_FILE_H
26	#define NMSTL_DEBUG_FILE_H "nmstl/internal"	27	#define NMSTL_DEBUG_FILE_H "nmstl/internal"

Return to bug 251444