Tue Nov 3 19:03:27 2015 UTC ()
More std::complex abuse. Deal with C++11's std::next.


(joerg)
diff -r1.32 -r1.33 pkgsrc/ham/fldigi/distinfo
diff -r1.2 -r1.3 pkgsrc/ham/fldigi/patches/patch-src_fsq_fsq.cxx
diff -r0 -r1.1 pkgsrc/ham/fldigi/patches/patch-src_ifkp_ifkp.cxx
cvs diff -r1.32 -r1.33 pkgsrc/ham/fldigi/distinfo (expand / switch to unified diff)

--- pkgsrc/ham/fldigi/distinfo 2015/11/02 23:57:23 1.32
+++ pkgsrc/ham/fldigi/distinfo 2015/11/03 19:03:27 1.33
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.32 2015/11/02 23:57:23 agc Exp $ 1$NetBSD: distinfo,v 1.33 2015/11/03 19:03:27 joerg Exp $
2 2
3SHA1 (fldigi-3.23.04.tar.gz) = 6f34c107c4dd86bc3291a24a74693dfc7a3e86e0 3SHA1 (fldigi-3.23.04.tar.gz) = 6f34c107c4dd86bc3291a24a74693dfc7a3e86e0
4RMD160 (fldigi-3.23.04.tar.gz) = 89e6ce57379015289d06b0f70a9189002996f3f1 4RMD160 (fldigi-3.23.04.tar.gz) = 89e6ce57379015289d06b0f70a9189002996f3f1
5SHA512 (fldigi-3.23.04.tar.gz) = af332e0da86300e5a18adec8841dabad3ceaea8cf0352b49a88a3387bf53422b4d19e73894352eb0f454f47f6612f37a5476f32dd25ddc49a80f287e345aeb3b 5SHA512 (fldigi-3.23.04.tar.gz) = af332e0da86300e5a18adec8841dabad3ceaea8cf0352b49a88a3387bf53422b4d19e73894352eb0f454f47f6612f37a5476f32dd25ddc49a80f287e345aeb3b
6Size (fldigi-3.23.04.tar.gz) = 2959610 bytes 6Size (fldigi-3.23.04.tar.gz) = 2959610 bytes
7SHA1 (patch-src_dominoex_dominoex.cxx) = 4c9a36896ee18562c2dee044f61301abde4f9a30 7SHA1 (patch-src_dominoex_dominoex.cxx) = 4c9a36896ee18562c2dee044f61301abde4f9a30
8SHA1 (patch-src_fsq_fsq.cxx) = 08dd9f2bc8d46dd5740e90944fe30cf2cc7e23b6 8SHA1 (patch-src_fsq_fsq.cxx) = 1356667cd19baa746014916bd7536c246bac91db
 9SHA1 (patch-src_ifkp_ifkp.cxx) = 22ce623ca24491a6ea9efb063851b1f04b7a7317
9SHA1 (patch-src_include_qrunner.h) = c395684f676bcd06e0d0f8a95a9c22dc92667879 10SHA1 (patch-src_include_qrunner.h) = c395684f676bcd06e0d0f8a95a9c22dc92667879
10SHA1 (patch-src_misc_configuration.cxx) = 4ebf0c46913f73047ad5b858f6d4ae9def82ec60 11SHA1 (patch-src_misc_configuration.cxx) = 4ebf0c46913f73047ad5b858f6d4ae9def82ec60
11SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c 12SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c
12SHA1 (patch-src_thor_thor.cxx) = 8148f14d6f2a96d5435be871345c24ed2e4cc8b9 13SHA1 (patch-src_thor_thor.cxx) = 8148f14d6f2a96d5435be871345c24ed2e4cc8b9
13SHA1 (patch-src_xmlrpcpp_XmlRpcBase64.h) = d8101efeb16e45af0a9814466b8405d9610c0700 14SHA1 (patch-src_xmlrpcpp_XmlRpcBase64.h) = d8101efeb16e45af0a9814466b8405d9610c0700
cvs diff -r1.2 -r1.3 pkgsrc/ham/fldigi/patches/Attic/patch-src_fsq_fsq.cxx (expand / switch to unified diff)

--- pkgsrc/ham/fldigi/patches/Attic/patch-src_fsq_fsq.cxx 2015/10/11 03:59:56 1.2
+++ pkgsrc/ham/fldigi/patches/Attic/patch-src_fsq_fsq.cxx 2015/11/03 19:03:27 1.3
@@ -1,23 +1,54 @@ @@ -1,23 +1,54 @@
1$NetBSD: patch-src_fsq_fsq.cxx,v 1.2 2015/10/11 03:59:56 mef Exp $ 1$NetBSD: patch-src_fsq_fsq.cxx,v 1.3 2015/11/03 19:03:27 joerg Exp $
2 2
3date: 2015-08-11 04:26:43 +0900; author: joerg; state: Exp; commitid: PzvH77JwGWkn2Lwy; 3Resolve conflict between std::next and the local variable of the same name.
4std::complex::imag() and std::complex::real() are not lvalues. 4std::complex::imag() and std::complex::real() are not lvalues.
5 5
6--- src/fsq/fsq.cxx.orig 2015-07-21 14:54:32.000000000 +0000 6--- src/fsq/fsq.cxx.orig 2015-09-28 18:24:41.000000000 +0000
7+++ src/fsq/fsq.cxx 7+++ src/fsq/fsq.cxx
8@@ -1197,9 +1197,12 @@ int fsq::rx_process(const double *buf, i 8@@ -1193,9 +1193,12 @@ int fsq::rx_process(const double *buf, i
9 &rx_stream[SHIFT_SIZE], // from 9 &rx_stream[SHIFT_SIZE], // from
10 BLOCK_SIZE*sizeof(*rx_stream)); // # bytes 10 BLOCK_SIZE*sizeof(*rx_stream)); // # bytes
11 memset(fft_data, 0, sizeof(fft_data)); 11 memset(fft_data, 0, sizeof(fft_data));
12- for (int i = 0; i < BLOCK_SIZE; i++) 12- for (int i = 0; i < BLOCK_SIZE; i++)
13- fft_data[i].real() = fft_data[i].imag() = 13- fft_data[i].real() = fft_data[i].imag() =
14- rx_stream[i] * a_blackman[i]; 14- rx_stream[i] * a_blackman[i];
15+ for (int i = 0; i < BLOCK_SIZE; i++) { 15+ for (int i = 0; i < BLOCK_SIZE; i++) {
16+ double r = rx_stream[i] * a_blackman[i]; 16+ double r = rx_stream[i] * a_blackman[i];
17+ fft_data[i].real(r); 17+ fft_data[i].real(r);
18+ fft_data[i].imag(r); 18+ fft_data[i].imag(r);
19+ } 19+ }
20+  20+
21 fft->ComplexFFT(fft_data); 21 fft->ComplexFFT(fft_data);
22 process_tones(); 22 process_tones();
23 } 23 }
 24@@ -1423,7 +1426,7 @@ static string tx_text_queue = "";
 25
 26 static vector<string> commands;
 27 #define NUMCOMMANDS 10
 28-static size_t next = 0;
 29+static size_t nextidx = 0;
 30
 31 double fsq_xmtdelay() // in seconds
 32 {
 33@@ -1440,9 +1443,9 @@ double fsq_xmtdelay() // in seconds
 34 void fsq_repeat_last_command()
 35 {
 36 fsq_tx_text->clear();
 37- fsq_tx_text->addstr(sz2utf8(commands[next].c_str()));
 38- next++;
 39- if (next == commands.size()) next = 0;
 40+ fsq_tx_text->addstr(sz2utf8(commands[nextidx].c_str()));
 41+ nextidx++;
 42+ if (nextidx == commands.size()) nextidx = 0;
 43 }
 44
 45 int get_fsq_tx_char(void)
 46@@ -1484,7 +1487,7 @@ void try_transmit(void *)
 47 if (active_modem != fsq_modem) return;
 48
 49 if (!active_modem->fsq_squelch_open() && trx_state == STATE_RX) {
 50- next = 0;
 51+ nextidx = 0;
 52 fsq_que_clear();
 53 //LOG_WARN("%s", "start_tx()");
 54 start_tx();
File Added: pkgsrc/ham/fldigi/patches/Attic/patch-src_ifkp_ifkp.cxx
$NetBSD: patch-src_ifkp_ifkp.cxx,v 1.1 2015/11/03 19:03:27 joerg Exp $

std::complex::imag() and std::complex::real() are not lvalues.

--- src/ifkp/ifkp.cxx.orig	2015-10-25 14:22:27.000000000 +0000
+++ src/ifkp/ifkp.cxx
@@ -580,9 +580,11 @@ int ifkp::rx_process(const double *buf, 
 						&rx_stream[IFKP_SHIFT_SIZE],			// from
 						IFKP_BLOCK_SIZE*sizeof(*rx_stream));	// # bytes
 				memset(fft_data, 0, sizeof(fft_data));
-				for (int i = 0; i < IFKP_BLOCK_SIZE; i++)
-					fft_data[i].real() = fft_data[i].imag() =
-						rx_stream[i] * a_blackman[i];
+				for (int i = 0; i < IFKP_BLOCK_SIZE; i++) {
+					double r = rx_stream[i] * a_blackman[i];
+					fft_data[i].real(r);
+					fft_data[i].imag(r);
+				}
 				fft->ComplexFFT(fft_data);
 				process_tones();
 			}