Attachment #429590 for bug #556600

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




++ eiskaltdcpp-2.2.9/dcpp/AdcHub.cpp


#include "AdcHub.h"

#ifndef Q_MOC_RUN
#include <boost/scoped_array.hpp>
#endif

#include "ChatMessage.h"
#include "ClientManager.h"
++ eiskaltdcpp-2.2.9/dcpp/Atomic.h

#pragma once

#include "CriticalSection.h"
#ifndef Q_MOC_RUN
#include <boost/version.hpp>
#include <boost/interprocess/detail/atomic.hpp>
#include <boost/cstdint.hpp>
#endif

namespace dcpp {

++ eiskaltdcpp-2.2.9/dcpp/CriticalSection.h

#ifndef DO_NOT_USE_MUTEX

#if defined (_WIN32)
#ifndef Q_MOC_RUN
#include <boost/thread/recursive_mutex.hpp>
#endif

#ifdef FIX_FOR_OLD_BOOST
template <typename Mutex>

    }
};
#else // FIX_FOR_OLD_BOOST
#ifndef Q_MOC_RUN
#include <boost/thread/lock_guard.hpp>
#endif
#endif // FIX_FOR_OLD_BOOST

#else


#else // DO_NOT_USE_MUTEX

#ifndef Q_MOC_RUN
#include <boost/signals2/mutex.hpp>
#endif

namespace dcpp {

++ eiskaltdcpp-2.2.9/dcpp/CryptoManager.cpp

#include "stdinc.h"
#include "CryptoManager.h"

#ifndef Q_MOC_RUN
#include <boost/scoped_array.hpp>
#endif

#include "File.h"
#include "LogManager.h"
++ eiskaltdcpp-2.2.9/dcpp/FilteredFile.h


#pragma once

#ifndef Q_MOC_RUN
#include <boost/scoped_array.hpp>
#endif
#include "Streams.h"
#include "Exception.h"

++ eiskaltdcpp-2.2.9/dcpp/FinishedItem.h


#pragma once

#ifndef Q_MOC_RUN
#include <boost/noncopyable.hpp>
#endif
#include "forward.h"
#include "Pointer.h"
#include "Util.h"
++ eiskaltdcpp-2.2.9/dcpp/format.h

#pragma once

#include <libintl.h>
#ifndef Q_MOC_RUN
#include <boost/format.hpp>
#endif

#ifdef BUILDING_DCPP

++ eiskaltdcpp-2.2.9/dcpp/forward.h

 * This file contains forward declarations for the various DC++ classes
 */

#ifndef Q_MOC_RUN
#include <boost/intrusive_ptr.hpp>
#endif

namespace dcpp {

++ eiskaltdcpp-2.2.9/dcpp/Pointer.h


#pragma once

#ifndef Q_MOC_RUN
#include <boost/intrusive_ptr.hpp>
#include <boost/detail/atomic_count.hpp>
#endif
#include "noexcept.h"

namespace dcpp {
++ eiskaltdcpp-2.2.9/dcpp/stdinc.h

#include <limits>
#include <libintl.h>

#ifndef Q_MOC_RUN
#include <boost/format.hpp>
#include <boost/scoped_array.hpp>
#include <boost/noncopyable.hpp>
#endif


#include <unordered_set>
++ eiskaltdcpp-2.2.9/dcpp/Thread.h

#include <sys/resource.h>
#endif

#ifndef Q_MOC_RUN
#include <boost/noncopyable.hpp>
#endif
#include "Exception.h"

namespace dcpp {
++ eiskaltdcpp-2.2.9/dcpp/TigerHash.cpp


#include <algorithm>
#include <cstring>
#ifndef Q_MOC_RUN
#include <boost/detail/endian.hpp>
#endif

#include "debug.h"

++ eiskaltdcpp-2.2.9/dcpp/TimerManager.cpp

#include "TimerManager.h"

#ifndef TIMER_OLD_BOOST
#ifndef Q_MOC_RUN
#include <boost/date_time/posix_time/ptime.hpp>
#endif
#endif
namespace dcpp {

#ifdef TIMER_OLD_BOOST
++ eiskaltdcpp-2.2.9/dcpp/TimerManager.h

#ifdef TIMER_OLD_BOOST
    #include "Semaphore.h"
#else
#ifndef Q_MOC_RUN
    #include <boost/thread/mutex.hpp>
#endif
#endif

#ifndef _WIN32
    #include <ctime>
++ eiskaltdcpp-2.2.9/dcpp/UPnPManager.h

#include "Thread.h"
#include "UPnP.h"
#include "Atomic.h"
#ifndef Q_MOC_RUN
#include <boost/ptr_container/ptr_vector.hpp>
#endif

namespace dcpp {

++ eiskaltdcpp-2.2.9/dcpp/User.h

#include "CriticalSection.h"
#include "Flags.h"
#include "forward.h"
#ifndef Q_MOC_RUN
#include <boost/utility.hpp>
#endif
#include <map>
#include <vector>

++ eiskaltdcpp-2.2.9/eiskaltdcpp-daemon/utility.cpp

#include <sys/stat.h>
#endif
#if (defined(__GNUC__) && !defined(__clang__)) && (__GNUC__ == 4 && __GNUC_MINOR__ < 7)
#ifndef Q_MOC_RUN
#include <boost/lexical_cast.hpp>
#endif
#define USE_BOOST_LEXICAL_CAST 1
#elif defined(__clang__) && (__clang_major__ == 3 && __clang_minor__ < 2)
#ifndef Q_MOC_RUN
#include <boost/lexical_cast.hpp>
#endif
#define USE_BOOST_LEXICAL_CAST 1
#endif
//---------------------------------------------------------------------------
++ eiskaltdcpp-2.2.9/eiskaltdcpp-qt/src/PoolItem.h


#pragma once

#ifndef Q_MOC_RUN
#include <boost/pool/pool_alloc.hpp>
#endif
#include <assert.h>

template <class T>
++ eiskaltdcpp-2.2.9/eiskaltdcpp-qt/src/SearchBlacklist.h

#include <QRegExp>
#include <QString>

#ifndef Q_MOC_RUN
#include <boost/noncopyable.hpp>
#endif

#include "dcpp/stdinc.h"
#include "dcpp/Singleton.h"
++ eiskaltdcpp-2.2.9/eiskaltdcpp-qt/src/SpyModel.h

#include <QList>
#include <QHash>

#ifndef Q_MOC_RUN
#include <boost/pool/object_pool.hpp>
#endif

#define COLUMN_SPY_COUNT        0
#define COLUMN_SPY_STRING       1
++ eiskaltdcpp-2.2.9/json/jsoncpp/jsoncpp.cpp



#if (defined(__GNUC__) && !defined(__clang__)) && (__GNUC__ == 4 && __GNUC_MINOR__ < 7)
#ifndef Q_MOC_RUN
#include <boost/lexical_cast.hpp>
#endif
#define USE_BOOST_LEXICAL_CAST 1
#elif defined(__clang__) && (__clang_major__ == 3 && __clang_minor__ < 2)
#ifndef Q_MOC_RUN
#include <boost/lexical_cast.hpp>
#endif
#define USE_BOOST_LEXICAL_CAST 1
#endif


Return to bug 556600

Line Link Here

(-)file_not_specified_in_diff (-21 / +71 lines)
0	-- eiskaltdcpp-2.2.9/dcpp/AdcHub.cpp	0	++ eiskaltdcpp-2.2.9/dcpp/AdcHub.cpp
Lines 20-26 Link Here
20		20
21	#include "AdcHub.h"	21	#include "AdcHub.h"
22		22
		23	#ifndef Q_MOC_RUN
23	#include <boost/scoped_array.hpp>	24	#include <boost/scoped_array.hpp>
		25	#endif
24		26
25	#include "ChatMessage.h"	27	#include "ChatMessage.h"
26	#include "ClientManager.h"	28	#include "ClientManager.h"
27	-- eiskaltdcpp-2.2.9/dcpp/Atomic.h	29	++ eiskaltdcpp-2.2.9/dcpp/Atomic.h
Lines 19-27 Link Here
19	#pragma once	19	#pragma once
20		20
21	#include "CriticalSection.h"	21	#include "CriticalSection.h"
		22	#ifndef Q_MOC_RUN
22	#include <boost/version.hpp>	23	#include <boost/version.hpp>
23	#include <boost/interprocess/detail/atomic.hpp>	24	#include <boost/interprocess/detail/atomic.hpp>
24	#include <boost/cstdint.hpp>	25	#include <boost/cstdint.hpp>
		26	#endif
25		27
26	namespace dcpp {	28	namespace dcpp {
27		29
28	-- eiskaltdcpp-2.2.9/dcpp/CriticalSection.h	30	++ eiskaltdcpp-2.2.9/dcpp/CriticalSection.h
Lines 24-30 Link Here
24	#ifndef DO_NOT_USE_MUTEX	24	#ifndef DO_NOT_USE_MUTEX
25		25
26	#if defined (_WIN32)	26	#if defined (_WIN32)
		27	#ifndef Q_MOC_RUN
27	#include <boost/thread/recursive_mutex.hpp>	28	#include <boost/thread/recursive_mutex.hpp>
		29	#endif
28		30
29	#ifdef FIX_FOR_OLD_BOOST	31	#ifdef FIX_FOR_OLD_BOOST
30	template <typename Mutex>	32	template <typename Mutex>
Lines 48-54 Link Here
48	}	50	}
49	};	51	};
50	#else // FIX_FOR_OLD_BOOST	52	#else // FIX_FOR_OLD_BOOST
		53	#ifndef Q_MOC_RUN
51	#include <boost/thread/lock_guard.hpp>	54	#include <boost/thread/lock_guard.hpp>
		55	#endif
52	#endif // FIX_FOR_OLD_BOOST	56	#endif // FIX_FOR_OLD_BOOST
53		57
54	#else	58	#else
Lines 73-79 Link Here
73		77
74	#else // DO_NOT_USE_MUTEX	78	#else // DO_NOT_USE_MUTEX
75		79
		80	#ifndef Q_MOC_RUN
76	#include <boost/signals2/mutex.hpp>	81	#include <boost/signals2/mutex.hpp>
		82	#endif
77		83
78	namespace dcpp {	84	namespace dcpp {
79		85
80	-- eiskaltdcpp-2.2.9/dcpp/CryptoManager.cpp	86	++ eiskaltdcpp-2.2.9/dcpp/CryptoManager.cpp
Lines 19-25 Link Here
19	#include "stdinc.h"	19	#include "stdinc.h"
20	#include "CryptoManager.h"	20	#include "CryptoManager.h"
21		21
		22	#ifndef Q_MOC_RUN
22	#include <boost/scoped_array.hpp>	23	#include <boost/scoped_array.hpp>
		24	#endif
23		25
24	#include "File.h"	26	#include "File.h"
25	#include "LogManager.h"	27	#include "LogManager.h"
26	-- eiskaltdcpp-2.2.9/dcpp/FilteredFile.h	28	++ eiskaltdcpp-2.2.9/dcpp/FilteredFile.h
Lines 18-24 Link Here
18		18
19	#pragma once	19	#pragma once
20		20
		21	#ifndef Q_MOC_RUN
21	#include <boost/scoped_array.hpp>	22	#include <boost/scoped_array.hpp>
		23	#endif
22	#include "Streams.h"	24	#include "Streams.h"
23	#include "Exception.h"	25	#include "Exception.h"
24		26
25	-- eiskaltdcpp-2.2.9/dcpp/FinishedItem.h	27	++ eiskaltdcpp-2.2.9/dcpp/FinishedItem.h
Lines 18-24 Link Here
18		18
19	#pragma once	19	#pragma once
20		20
		21	#ifndef Q_MOC_RUN
21	#include <boost/noncopyable.hpp>	22	#include <boost/noncopyable.hpp>
		23	#endif
22	#include "forward.h"	24	#include "forward.h"
23	#include "Pointer.h"	25	#include "Pointer.h"
24	#include "Util.h"	26	#include "Util.h"
25	-- eiskaltdcpp-2.2.9/dcpp/format.h	27	++ eiskaltdcpp-2.2.9/dcpp/format.h
Lines 19-25 Link Here
19	#pragma once	19	#pragma once
20		20
21	#include <libintl.h>	21	#include <libintl.h>
		22	#ifndef Q_MOC_RUN
22	#include <boost/format.hpp>	23	#include <boost/format.hpp>
		24	#endif
23		25
24	#ifdef BUILDING_DCPP	26	#ifdef BUILDING_DCPP
25		27
26	-- eiskaltdcpp-2.2.9/dcpp/forward.h	28	++ eiskaltdcpp-2.2.9/dcpp/forward.h
Lines 22-28 Link Here
22	* This file contains forward declarations for the various DC++ classes	22	* This file contains forward declarations for the various DC++ classes
23	*/	23	*/
24		24
		25	#ifndef Q_MOC_RUN
25	#include <boost/intrusive_ptr.hpp>	26	#include <boost/intrusive_ptr.hpp>
		27	#endif
26		28
27	namespace dcpp {	29	namespace dcpp {
28		30
29	-- eiskaltdcpp-2.2.9/dcpp/Pointer.h	31	++ eiskaltdcpp-2.2.9/dcpp/Pointer.h
Lines 18-25 Link Here
18		18
19	#pragma once	19	#pragma once
20		20
		21	#ifndef Q_MOC_RUN
21	#include <boost/intrusive_ptr.hpp>	22	#include <boost/intrusive_ptr.hpp>
22	#include <boost/detail/atomic_count.hpp>	23	#include <boost/detail/atomic_count.hpp>
		24	#endif
23	#include "noexcept.h"	25	#include "noexcept.h"
24		26
25	namespace dcpp {	27	namespace dcpp {
26	-- eiskaltdcpp-2.2.9/dcpp/stdinc.h	28	++ eiskaltdcpp-2.2.9/dcpp/stdinc.h
Lines 91-99 Link Here
91	#include <limits>	91	#include <limits>
92	#include <libintl.h>	92	#include <libintl.h>
93		93
		94	#ifndef Q_MOC_RUN
94	#include <boost/format.hpp>	95	#include <boost/format.hpp>
95	#include <boost/scoped_array.hpp>	96	#include <boost/scoped_array.hpp>
96	#include <boost/noncopyable.hpp>	97	#include <boost/noncopyable.hpp>
		98	#endif
97		99
98		100
99	#include <unordered_set>	101	#include <unordered_set>
100	-- eiskaltdcpp-2.2.9/dcpp/Thread.h	102	++ eiskaltdcpp-2.2.9/dcpp/Thread.h
Lines 26-32 Link Here
26	#include <sys/resource.h>	26	#include <sys/resource.h>
27	#endif	27	#endif
28		28
		29	#ifndef Q_MOC_RUN
29	#include <boost/noncopyable.hpp>	30	#include <boost/noncopyable.hpp>
		31	#endif
30	#include "Exception.h"	32	#include "Exception.h"
31		33
32	namespace dcpp {	34	namespace dcpp {
33	-- eiskaltdcpp-2.2.9/dcpp/TigerHash.cpp	35	++ eiskaltdcpp-2.2.9/dcpp/TigerHash.cpp
Lines 32-38 Link Here
32		32
33	#include <algorithm>	33	#include <algorithm>
34	#include <cstring>	34	#include <cstring>
		35	#ifndef Q_MOC_RUN
35	#include <boost/detail/endian.hpp>	36	#include <boost/detail/endian.hpp>
		37	#endif
36		38
37	#include "debug.h"	39	#include "debug.h"
38		40
39	-- eiskaltdcpp-2.2.9/dcpp/TimerManager.cpp	41	++ eiskaltdcpp-2.2.9/dcpp/TimerManager.cpp
Lines 21-28 Link Here
21	#include "TimerManager.h"	21	#include "TimerManager.h"
22		22
23	#ifndef TIMER_OLD_BOOST	23	#ifndef TIMER_OLD_BOOST
		24	#ifndef Q_MOC_RUN
24	#include <boost/date_time/posix_time/ptime.hpp>	25	#include <boost/date_time/posix_time/ptime.hpp>
25	#endif	26	#endif
		27	#endif
26	namespace dcpp {	28	namespace dcpp {
27		29
28	#ifdef TIMER_OLD_BOOST	30	#ifdef TIMER_OLD_BOOST
29	-- eiskaltdcpp-2.2.9/dcpp/TimerManager.h	31	++ eiskaltdcpp-2.2.9/dcpp/TimerManager.h
Lines 25-32 Link Here
25	#ifdef TIMER_OLD_BOOST	25	#ifdef TIMER_OLD_BOOST
26	#include "Semaphore.h"	26	#include "Semaphore.h"
27	#else	27	#else
		28	#ifndef Q_MOC_RUN
28	#include <boost/thread/mutex.hpp>	29	#include <boost/thread/mutex.hpp>
29	#endif	30	#endif
		31	#endif
30		32
31	#ifndef _WIN32	33	#ifndef _WIN32
32	#include <ctime>	34	#include <ctime>
33	-- eiskaltdcpp-2.2.9/dcpp/UPnPManager.h	35	++ eiskaltdcpp-2.2.9/dcpp/UPnPManager.h
Lines 23-29 Link Here
23	#include "Thread.h"	23	#include "Thread.h"
24	#include "UPnP.h"	24	#include "UPnP.h"
25	#include "Atomic.h"	25	#include "Atomic.h"
		26	#ifndef Q_MOC_RUN
26	#include <boost/ptr_container/ptr_vector.hpp>	27	#include <boost/ptr_container/ptr_vector.hpp>
		28	#endif
27		29
28	namespace dcpp {	30	namespace dcpp {
29		31
30	-- eiskaltdcpp-2.2.9/dcpp/User.h	32	++ eiskaltdcpp-2.2.9/dcpp/User.h
Lines 25-31 Link Here
25	#include "CriticalSection.h"	25	#include "CriticalSection.h"
26	#include "Flags.h"	26	#include "Flags.h"
27	#include "forward.h"	27	#include "forward.h"
		28	#ifndef Q_MOC_RUN
28	#include <boost/utility.hpp>	29	#include <boost/utility.hpp>
		30	#endif
29	#include <map>	31	#include <map>
30	#include <vector>	32	#include <vector>
31		33
32	-- eiskaltdcpp-2.2.9/eiskaltdcpp-daemon/utility.cpp	34	++ eiskaltdcpp-2.2.9/eiskaltdcpp-daemon/utility.cpp
Lines 19-28 Link Here
19	#include <sys/stat.h>	19	#include <sys/stat.h>
20	#endif	20	#endif
21	#if (defined(__GNUC__) && !defined(__clang__)) && (__GNUC__ == 4 && __GNUC_MINOR__ < 7)	21	#if (defined(__GNUC__) && !defined(__clang__)) && (__GNUC__ == 4 && __GNUC_MINOR__ < 7)
		22	#ifndef Q_MOC_RUN
22	#include <boost/lexical_cast.hpp>	23	#include <boost/lexical_cast.hpp>
		24	#endif
23	#define USE_BOOST_LEXICAL_CAST 1	25	#define USE_BOOST_LEXICAL_CAST 1
24	#elif defined(__clang__) && (__clang_major__ == 3 && __clang_minor__ < 2)	26	#elif defined(__clang__) && (__clang_major__ == 3 && __clang_minor__ < 2)
		27	#ifndef Q_MOC_RUN
25	#include <boost/lexical_cast.hpp>	28	#include <boost/lexical_cast.hpp>
		29	#endif
26	#define USE_BOOST_LEXICAL_CAST 1	30	#define USE_BOOST_LEXICAL_CAST 1
27	#endif	31	#endif
28	//---------------------------------------------------------------------------	32	//---------------------------------------------------------------------------
29	-- eiskaltdcpp-2.2.9/eiskaltdcpp-qt/src/PoolItem.h	33	++ eiskaltdcpp-2.2.9/eiskaltdcpp-qt/src/PoolItem.h
Lines 9-15 Link Here
9		9
10	#pragma once	10	#pragma once
11		11
		12	#ifndef Q_MOC_RUN
12	#include <boost/pool/pool_alloc.hpp>	13	#include <boost/pool/pool_alloc.hpp>
		14	#endif
13	#include <assert.h>	15	#include <assert.h>
14		16
15	template <class T>	17	template <class T>
16	-- eiskaltdcpp-2.2.9/eiskaltdcpp-qt/src/SearchBlacklist.h	18	++ eiskaltdcpp-2.2.9/eiskaltdcpp-qt/src/SearchBlacklist.h
Lines 14-20 Link Here
14	#include <QRegExp>	14	#include <QRegExp>
15	#include <QString>	15	#include <QString>
16		16
		17	#ifndef Q_MOC_RUN
17	#include <boost/noncopyable.hpp>	18	#include <boost/noncopyable.hpp>
		19	#endif
18		20
19	#include "dcpp/stdinc.h"	21	#include "dcpp/stdinc.h"
20	#include "dcpp/Singleton.h"	22	#include "dcpp/Singleton.h"
21	-- eiskaltdcpp-2.2.9/eiskaltdcpp-qt/src/SpyModel.h	23	++ eiskaltdcpp-2.2.9/eiskaltdcpp-qt/src/SpyModel.h
Lines 13-19 Link Here
13	#include <QList>	13	#include <QList>
14	#include <QHash>	14	#include <QHash>
15		15
		16	#ifndef Q_MOC_RUN
16	#include <boost/pool/object_pool.hpp>	17	#include <boost/pool/object_pool.hpp>
		18	#endif
17		19
18	#define COLUMN_SPY_COUNT 0	20	#define COLUMN_SPY_COUNT 0
19	#define COLUMN_SPY_STRING 1	21	#define COLUMN_SPY_STRING 1
20	-- eiskaltdcpp-2.2.9/json/jsoncpp/jsoncpp.cpp	22	++ eiskaltdcpp-2.2.9/json/jsoncpp/jsoncpp.cpp
Lines 77-86 Link Here
77		77
78		78
79	#if (defined(__GNUC__) && !defined(__clang__)) && (__GNUC__ == 4 && __GNUC_MINOR__ < 7)	79	#if (defined(__GNUC__) && !defined(__clang__)) && (__GNUC__ == 4 && __GNUC_MINOR__ < 7)
		80	#ifndef Q_MOC_RUN
80	#include <boost/lexical_cast.hpp>	81	#include <boost/lexical_cast.hpp>
		82	#endif
81	#define USE_BOOST_LEXICAL_CAST 1	83	#define USE_BOOST_LEXICAL_CAST 1
82	#elif defined(__clang__) && (__clang_major__ == 3 && __clang_minor__ < 2)	84	#elif defined(__clang__) && (__clang_major__ == 3 && __clang_minor__ < 2)
		85	#ifndef Q_MOC_RUN
83	#include <boost/lexical_cast.hpp>	86	#include <boost/lexical_cast.hpp>
		87	#endif
84	#define USE_BOOST_LEXICAL_CAST 1	88	#define USE_BOOST_LEXICAL_CAST 1
85	#endif	89	#endif
86		90