Navigation

← Previous Changeset
Next Changeset →

Changeset 1234

Timestamp:

05/29/08 01:24:21 (15 years ago)

Author:

holin

Message:

fix gcc 4.3 compile errors and some warnings (largely from Adrian Knoth)

Files:

trunk/libffado/external/dbus/src/message.cpp (modified) (1 diff)
trunk/libffado/external/dbus/src/object.cpp (modified) (1 diff)
trunk/libffado/external/dbus/src/types.cpp (modified) (1 diff)
trunk/libffado/external/dbus/tools/xml2cpp.cpp (modified) (1 diff)
trunk/libffado/src/bebob/bebob_avdevice.cpp (modified) (1 diff)
trunk/libffado/src/bebob/bebob_dl_mgr.cpp (modified) (1 diff)
trunk/libffado/src/bebob/focusrite/focusrite_saffirepro.cpp (modified) (1 diff)
trunk/libffado/src/bebob/terratec/terratec_device.cpp (modified) (1 diff)
trunk/libffado/src/dice/dice_avdevice.cpp (modified) (1 diff)
trunk/libffado/src/fireworks/efc/efc_cmd.cpp (modified) (1 diff)
trunk/libffado/src/fireworks/efc/efc_cmd.h (modified) (1 diff)
trunk/libffado/src/fireworks/fireworks_firmware.cpp (modified) (1 diff)
trunk/libffado/src/libavc/avc_definitions.h (modified) (1 diff)
trunk/libffado/src/libavc/descriptors/avc_descriptor.cpp (modified) (1 diff)
trunk/libffado/src/libavc/descriptors/avc_descriptor_cmd.cpp (modified) (1 diff)
trunk/libffado/src/libavc/general/avc_extended_plug_info.cpp (modified) (1 diff)
trunk/libffado/src/libavc/general/avc_generic.cpp (modified) (1 diff)
trunk/libffado/src/libieee1394/ARMHandler.cpp (modified) (1 diff)
trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (1 diff)
trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (1 diff)
trunk/libffado/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp (modified) (1 diff)
trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp (modified) (1 diff)
trunk/libffado/src/libutil/cmd_serialize.cpp (modified) (1 diff)
trunk/libffado/src/libutil/IpcRingBuffer.cpp (modified) (1 diff)
trunk/libffado/src/libutil/serialize_libxml.cpp (modified) (1 diff)
trunk/libffado/src/libutil/TimestampedBuffer.cpp (modified) (1 diff)
trunk/libffado/src/libutil/unittests.cpp (modified) (1 diff)
trunk/libffado/src/motu/motu_avdevice.cpp (modified) (1 diff)
trunk/libffado/support/firmware/bridgeco-downloader.cpp (modified) (1 diff)
trunk/libffado/support/firmware/downloader.cpp (modified) (1 diff)
trunk/libffado/support/firmware/fireworks-downloader.cpp (modified) (1 diff)
trunk/libffado/tests/scan-devreg.cpp (modified) (1 diff)
trunk/libffado/tests/systemtests/gen-loadpulses.cpp (modified) (1 diff)
trunk/libffado/tests/systemtests/test-isorecv-1.cpp (modified) (1 diff)
trunk/libffado/tests/systemtests/test-sysload.cpp (modified) (1 diff)
trunk/libffado/tests/test-avccmd.cpp (modified) (1 diff)
trunk/libffado/tests/test-echomixer.cpp (modified) (1 diff)
trunk/libffado/tests/test-enhanced-mixer.cpp (modified) (1 diff)
trunk/libffado/tests/test-messagequeue.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/libffado/external/dbus/src/message.cpp

r562 r1234

30 30 #include "message_p.h"
31 31
32 #include <cstdlib>
33
32 34 using namespace DBus;
33 35
trunk/libffado/external/dbus/src/object.cpp

r562 r1234

33 33 #include "server_p.h"
34 34 #include "connection_p.h"
35
36 #include <cstring>
35 37
36 38 using namespace DBus;
trunk/libffado/external/dbus/src/types.cpp

r562 r1234

30 30 #include "message_p.h"
31 31 #include "internalerror.h"
32
33 #include <cstdlib>
32 34
33 35 using namespace DBus;
trunk/libffado/external/dbus/tools/xml2cpp.cpp

r962 r1234

32 32 #include <fstream>
33 33 #include <sstream>
34 #include <cstdlib>
35 #include <cstring>
34 36
35 37 using namespace std;

trunk/libffado/src/bebob/bebob_avdevice.cpp

r1232	r1234
53	53	#include <sstream>
54	54	#include <unistd.h>
55		#include <stdlib.h>
	55	#include <cstdlib>
	56	#include <cstring>
56	57	#include <sys/stat.h>
57	58

trunk/libffado/src/bebob/bebob_dl_mgr.cpp

r1135 r1234

35 35
36 36 #include <cstdio>
37 #include <cstring>
37 38
38 39 namespace BeBoB {
trunk/libffado/src/bebob/focusrite/focusrite_saffirepro.cpp

r1184 r1234

29 29
30 30 #include "libutil/ByteSwap.h"
31 #include <cstring>
31 32
32 33 namespace BeBoB {

trunk/libffado/src/bebob/terratec/terratec_device.cpp

r1175	r1234
126	126	uint8_t fb_extsync_value = getSelectorFBValue(8);
127	127	uint8_t fb_syncsource_value = getSelectorFBValue(9);
128		return ~~fb_extsync_value & 0x01 \| (fb_syncsource_value << 1) & 0x01~~;
	128	return (fb_extsync_value & 0x01) \| ((fb_syncsource_value << 1) & 0x01);
129	129	}
130	130

trunk/libffado/src/dice/dice_avdevice.cpp

r1218	r1234
30	30	#include "debugmodule/debugmodule.h"
31	31
32		~~#include <string>~~
33		~~#include <stdint.h>~~
34		~~#include <assert.h>~~
35	32	#include "libutil/ByteSwap.h"
36	33	#include <libraw1394/csr.h>
37	34
	35	#include <stdint.h>
38	36	#include <iostream>
39	37	#include <sstream>
40	38
41	39	#include <string>
	40	#include <cstring>
	41	#include <assert.h>
	42
42	43	using namespace std;
43	44

trunk/libffado/src/fireworks/efc/efc_cmd.cpp

r1136 r1234

27 27 #include "libutil/ByteSwap.h"
28 28 #include <iostream>
29 #include <cstring>
29 30
30 31 using namespace std;
trunk/libffado/src/fireworks/efc/efc_cmd.h

r1136 r1234

197 197 };
198 198
199 ~~typedef~~ struct efc_header
199 struct efc_header
200 200 {
201 201 uint32_t version;
trunk/libffado/src/fireworks/fireworks_firmware.cpp

r1211 r1234

35 35 #include <iostream>
36 36 #include <fstream>
37 #include <cstring>
37 38
38 39 #define ECHO_FLASH_ERASE_TIMEOUT_MILLISECS 2000
trunk/libffado/src/libavc/avc_definitions.h

r864 r1234

26 26
27 27 #include <libavc1394/avc1394.h>
28 #include <cstring>
29 #include <cstdlib>
28 30 #include <ostream>
29 31
trunk/libffado/src/libavc/descriptors/avc_descriptor.cpp

r1024 r1234

32 32 #include "libieee1394/configrom.h"
33 33
34 #include <cstring>
35
34 36 namespace AVC {
35 37
trunk/libffado/src/libavc/descriptors/avc_descriptor_cmd.cpp

r1135 r1234

30 30 #include "libutil/ByteSwap.h"
31 31 #include <iostream>
32 #include <cstring>
32 33
33 34 using namespace std;
trunk/libffado/src/libavc/general/avc_extended_plug_info.cpp

r1135 r1234

28 28 #include "libutil/ByteSwap.h"
29 29 #include <iostream>
30 #include <cstdlib>
31 #include <cstring>
30 32
31 33 using namespace std;
trunk/libffado/src/libavc/general/avc_generic.cpp

r1135 r1234

31 31
32 32 #include "libutil/ByteSwap.h"
33
34 #include <cstring>
35 #include <cstdlib>
33 36
34 37 #define DEBUG_EXTRA_VERBOSE 5
trunk/libffado/src/libieee1394/ARMHandler.cpp

r1046 r1234

21 21 *
22 22 */
23
24 #include <cstring>
25 #include <cstdlib>
23 26
24 27 #include "ARMHandler.h"
trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

r1172 r1234

32 32 #include "libutil/Watchdog.h"
33 33
34 #include <cstring>
34 35 #include <assert.h>
35 36
trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp

r1149 r1234

37 37 #include "libutil/ByteSwap.h"
38 38 #include <assert.h>
39 #include <cstring>
39 40
40 41 #define AMDTP_FLOAT_MULTIPLIER 2147483392.0

trunk/libffado/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp

r1136	r1234
35	35	#include "libieee1394/cycletimer.h"
36	36
	37	#include "libutil/ByteSwap.h"
	38
	39	#include <cstring>
37	40	#include <math.h>
38		~~#include "libutil/ByteSwap.h"~~
39	41	#include <assert.h>
40	42

trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp

r1168 r1234

36 36
37 37 #include "libutil/ByteSwap.h"
38
39 #include <cstring>
38 40 #include <assert.h>
39 41
trunk/libffado/src/libutil/cmd_serialize.cpp

r1135 r1234

26 26 #include <iostream>
27 27 #include <iomanip>
28 #include <cstdlib>
29 #include <cstring>
28 30
29 31 #include "libutil/ByteSwap.h"

trunk/libffado/src/libutil/IpcRingBuffer.cpp

r1172	r1234
28	28	#include "PosixMutex.h"
29	29	#include "Functors.h"
	30
	31	#include <cstring>
30	32
31	33	// FIXME: if we restrict the nb_blocks to a power of two, the overflows

trunk/libffado/src/libutil/serialize_libxml.cpp

r1154 r1234

24 24
25 25 #include "serialize.h"
26
27 #include <cstring>
28 #include <cstdlib>
26 29
27 30 using namespace std;
trunk/libffado/src/libutil/TimestampedBuffer.cpp

r1012 r1234

31 31 #include "errno.h"
32 32
33 #include <cstdlib>
34 #include <cstring>
33 35
34 36 #define DLL_PI (3.141592653589793238)
trunk/libffado/src/libutil/unittests.cpp

r1154 r1234

28 28
29 29 #include <stdio.h>
30 #include <cstring>
30 31
31 32 using namespace Util;

trunk/libffado/src/motu/motu_avdevice.cpp

r1207	r1234
1246	1246	// what the "Optical control" register does, so the values it's set to
1247	1247	// are more or less "magic" numbers.
1248		if (~~reg & MOTU_OPTICAL_IN_MODE_MASK~~ != (MOTU_OPTICAL_MODE_ADAT<<8))
	1248	if ((reg & MOTU_OPTICAL_IN_MODE_MASK) != (MOTU_OPTICAL_MODE_ADAT<<8))
1249	1249	opt_ctrl \|= 0x00000080;
1250		if (~~reg & MOTU_OPTICAL_OUT_MODE_MASK~~ != (MOTU_OPTICAL_MODE_ADAT<<10))
	1250	if ((reg & MOTU_OPTICAL_OUT_MODE_MASK) != (MOTU_OPTICAL_MODE_ADAT<<10))
1251	1251	opt_ctrl \|= 0x00000040;
1252	1252

trunk/libffado/support/firmware/bridgeco-downloader.cpp

r1009 r1234

31 31
32 32 #include <iostream>
33 #include <cstdlib>
34 #include <cstring>
33 35
34 36 using namespace std;
trunk/libffado/support/firmware/downloader.cpp

r1011 r1234

31 31
32 32 #include <iostream>
33
34 #include <~~stdlib.h~~>
33 #include <cstdlib>
34 #include <cstring>
35 35
36 36 using namespace std;

trunk/libffado/support/firmware/fireworks-downloader.cpp

r1053	r1234
36	36
37	37	#include <iostream>
38
39		~~#include <string.h>~~
40	38	#include <string>
	39	#include <cstring>
	40	#include <cstdlib>
41	41
42	42	#define MAGIC_THAT_SAYS_I_KNOW_WHAT_IM_DOING 0x001807198000LL

trunk/libffado/tests/scan-devreg.cpp

r1136	r1234
34	34
35	35	#include <argp.h>
36		#include <~~stdlib.h~~>
	36	#include <cstdlib>
37	37	#include <iostream>
	38	#include <cstring>
38	39
39	40	using namespace std;

trunk/libffado/tests/systemtests/gen-loadpulses.cpp

r1148 r1234

37 37 #include "debugmodule/debugmodule.h"
38 38 #include "realtimetools.h"
39 #include <cstdlib>
39 40
40 41 uint32_t count = 0;
trunk/libffado/tests/systemtests/test-isorecv-1.cpp

r1146 r1234

35 35 #include "debugmodule/debugmodule.h"
36 36 #include "realtimetools.h"
37 #include <cstdlib>
37 38
38 39 uint32_t count = 0;
trunk/libffado/tests/systemtests/test-sysload.cpp

r1146 r1234

37 37 #include "debugmodule/debugmodule.h"
38 38 #include "realtimetools.h"
39 #include <cstdlib>
39 40
40 41 uint32_t count = 0;

trunk/libffado/tests/test-avccmd.cpp

r1146	r1234
260	260	bool tmpresult=true;
261	261	nargs=0;
262		while(~~tmpresult=de.read(&args[nargs]~~)) {
	262	while((tmpresult=de.read(&args[nargs]))) {
263	263	nargs++;
264	264	}

trunk/libffado/tests/test-echomixer.cpp

r1146	r1234
40	40
41	41	#include <argp.h>
42		~~#include <stdlib.h>~~
43	42	#include <iostream>
	43	#include <cstdlib>
	44	#include <cstring>
44	45
45	46	using namespace std;

trunk/libffado/tests/test-enhanced-mixer.cpp

r864 r1234

26 26
27 27 #include "libieee1394/ieee1394service.h"
28 #include <cstdlib>
29 #include <cstring>
28 30
29 31 using namespace AVC;
trunk/libffado/tests/test-messagequeue.cpp

r1172 r1234

33 33
34 34 #include <semaphore.h>
35 #include <cstring>
35 36
36 37 using namespace Util;

r562	r1234
30	30	#include "message_p.h"
31	31
	32	#include <cstdlib>
	33
32	34	using namespace DBus;
33	35

r562	r1234
33	33	#include "server_p.h"
34	34	#include "connection_p.h"
	35
	36	#include <cstring>
35	37
36	38	using namespace DBus;

r562	r1234
30	30	#include "message_p.h"
31	31	#include "internalerror.h"
	32
	33	#include <cstdlib>
32	34
33	35	using namespace DBus;

r962	r1234
32	32	#include <fstream>
33	33	#include <sstream>
	34	#include <cstdlib>
	35	#include <cstring>
34	36
35	37	using namespace std;

r1135	r1234
35	35
36	36	#include <cstdio>
	37	#include <cstring>
37	38
38	39	namespace BeBoB {

r1136	r1234
197	197	};
198	198
199		~~typedef~~ struct efc_header
	199	struct efc_header
200	200	{
201	201	uint32_t version;

r864	r1234
26	26
27	27	#include <libavc1394/avc1394.h>
	28	#include <cstring>
	29	#include <cstdlib>
28	30	#include <ostream>
29	31

r1024	r1234
32	32	#include "libieee1394/configrom.h"
33	33
	34	#include <cstring>
	35
34	36	namespace AVC {
35	37

r1046	r1234
21	21	*
22	22	*/
	23
	24	#include <cstring>
	25	#include <cstdlib>
23	26
24	27	#include "ARMHandler.h"

r1172	r1234
32	32	#include "libutil/Watchdog.h"
33	33
	34	#include <cstring>
34	35	#include <assert.h>
35	36

r1135	r1234
26	26	#include <iostream>
27	27	#include <iomanip>
	28	#include <cstdlib>
	29	#include <cstring>
28	30
29	31	#include "libutil/ByteSwap.h"

r1154	r1234
24	24
25	25	#include "serialize.h"
	26
	27	#include <cstring>
	28	#include <cstdlib>
26	29
27	30	using namespace std;

r1012	r1234
31	31	#include "errno.h"
32	32
	33	#include <cstdlib>
	34	#include <cstring>
33	35
34	36	#define DLL_PI (3.141592653589793238)

r1154	r1234
28	28
29	29	#include <stdio.h>
	30	#include <cstring>
30	31
31	32	using namespace Util;

r1148	r1234
37	37	#include "debugmodule/debugmodule.h"
38	38	#include "realtimetools.h"
	39	#include <cstdlib>
39	40
40	41	uint32_t count = 0;

r864	r1234
26	26
27	27	#include "libieee1394/ieee1394service.h"
	28	#include <cstdlib>
	29	#include <cstring>
28	30
29	31	using namespace AVC;

r1172	r1234
33	33
34	34	#include <semaphore.h>
	35	#include <cstring>
35	36
36	37	using namespace Util;

Navigation

Changeset 1234

Legend:

Download in other formats: