51821 2004-05-23 06:47 0000 galib doesn't compile due to template errors 2004-05-27 06:38:17 0000 1 1 1 Unclassified Gentoo Linux Applications unspecified All Linux RESOLVED FIXED P2 normal --- 1 FnH@antwerpen.be sci@gentoo.org FnH@antwerpen.be 2004-05-23 06:47:34 0000 gcc3.3 is more standards-conformant and refuses to compile galib due to wrong template code Reproducible: Always Steps to Reproduce: 1.emerge galib Actual Results: In file included from ex21.C:17: ../ga/GARealGenome.h:59: error: ISO C++ forbids declaration of `allele' with no type ../ga/GARealGenome.h:59: error: template-id `allele<>' for `int GAAlleleSet<float>::allele(unsigned int) const' does not match any template declaration ../ga/GARealGenome.h:59: error: syntax error before `{' token ../ga/GARealGenome.h:65: error: `n' was not declared in this scope ../ga/GARealGenome.h:66: error: parse error before `if' ../ga/GARealGenome.h:69: error: ISO C++ forbids declaration of `value' with no type ../ga/GARealGenome.h:69: error: `core' was not declared in this scope ../ga/GARealGenome.h:69: error: `i' was not declared in this scope ../ga/GARealGenome.h:69: error: `core' was not declared in this scope ../ga/GARealGenome.h:70: error: parse error before `if' ../ga/GARealGenome.h:74: error: ISO C++ forbids declaration of `value' with no type ../ga/GARealGenome.h:74: error: redefinition of `int value' ../ga/GARealGenome.h:69: error: `int value' previously defined here ../ga/GARealGenome.h:74: error: `core' was not declared in this scope ../ga/GARealGenome.h:75: error: parse error before `}' token {standard input}: Assembler messages: {standard input}:21: Error: symbol `value' is already defined make[1]: *** [ex21.o] Error 1 make[1]: Leaving directory `/var/tmp/portage/galib-2.4.5/work/galib245/examples'make: *** [all] Error 2 !!! ERROR: dev-libs/galib-2.4.5 failed. !!! Function src_compile, Line 19, Exitcode 2 !!! make failed Expected Results: install solution for this error: http://mailman.mit.edu/pipermail/galib/2003-December/000896.html FnH@antwerpen.be 2004-05-23 06:49:11 0000 Created an attachment (id=31887) Patches the source as specified in the mail to make it compile with gcc 3.3 FnH@antwerpen.be 2004-05-23 06:51:56 0000 added the following line in the ebuild in the function src_compile(): epatch ${FILESDIR}/patch-gcc3.patch This works, but I'm sure it isn't the correct way to apply patches in an ebuild. Could someone please do this the right way? FnH@antwerpen.be 2004-05-23 07:21:44 0000 Oops ... patch was wrong ... attaching good patch ... ebuild just needs to be cleaned up now before it can get committed FnH@antwerpen.be 2004-05-23 07:22:47 0000 Created an attachment (id=31889) files/patch-gcc3.patch phosphan@gentoo.org 2004-05-27 06:38:17 0000 Well, I preferred to add prototypes to the header instead of moving the implementation there, but thanks for reporting this and even providing a workaround! CVS revision 1.3 should fix this. 31887 2004-05-23 06:49 0000 Patches the source as specified in the mail to make it compile with gcc 3.3 patch-gcc3.patch text/plain ZGlmZiAtTmF1ciBnYWxpYjI0NS1vcmlnL2dhL0dBUmVhbEdlbm9tZS5DIGdhbGliMjQ1L2dhL0dB UmVhbEdlbm9tZS5DCi0tLSBnYWxpYjI0NS1vcmlnL2dhL0dBUmVhbEdlbm9tZS5DCTIwMDQtMDUt MjMgMTU6MDk6MDEuNzYyMzM2NTI4ICswMjAwCisrKyBnYWxpYjI0NS9nYS9HQVJlYWxHZW5vbWUu QwkyMDA0LTA1LTIzIDE1OjEyOjEzLjk0NDEyMDQ1NiArMDIwMApAQCAtNzcsNjkgKzc3LDYgQEAK IAogCiAKLS8vIFdlIG11c3QgYWxzbyBzcGVjaWFsaXplIHRoZSBhbGxlbGUgc2V0IHNvIHRoYXQg dGhlIGFsbGVsZXMgYXJlIGhhbmRsZWQKLS8vIHByb3Blcmx5LiAgQmUgc3VyZSB0byBoYW5kbGUg Ym91bmRzIGNvcnJlY3RseSB3aGV0aGVyIHdlIGFyZSBkaXNjcmV0aXplZAotLy8gb3IgY29udGlu dW91cy4gIEhhbmRsZSB0aGUgY2FzZSB3aGVyZSBzb21lb25lIHNldHMgc3R1cGlkIGJvdW5kcyB0 aGF0IAotLy8gbWlnaHQgY2F1c2UgYW4gaW5maW5pdGUgbG9vcCBmb3IgZXhjbHVzaXZlIGJvdW5k cy4KLWZsb2F0Ci1HQUFsbGVsZVNldDxmbG9hdD46OmFsbGVsZSgpIGNvbnN0IHsKLSAgZmxvYXQg dmFsdWUgPSAwLjA7Ci0gIGlmKGNvcmUtPnR5cGUgPT0gR0FBbGxlbGU6OkVOVU1FUkFURUQpCi0g ICAgdmFsdWUgPSBjb3JlLT5hW0dBUmFuZG9tSW50KDAsIGNvcmUtPnN6LTEpXTsKLSAgZWxzZSBp Zihjb3JlLT50eXBlID09IEdBQWxsZWxlOjpESVNDUkVUSVpFRCl7Ci0gICAgZmxvYXQgbiA9IChj b3JlLT5hWzFdIC0gY29yZS0+YVswXSkgLyBjb3JlLT5hWzJdOwotICAgIGludCBtID0gKGludClu OwotICAgIGlmKGNvcmUtPmxvd2VyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFKSBtIC09IDE7Ci0g ICAgaWYoY29yZS0+dXBwZXJiID09IEdBQWxsZWxlOjpFWENMVVNJVkUpIG0gLT0gMTsKLSAgICB2 YWx1ZSA9IGNvcmUtPmFbMF0gKyBHQVJhbmRvbUludCgwLChpbnQpbSkgKiBjb3JlLT5hWzJdOwot ICAgIGlmKGNvcmUtPmxvd2VyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFKSB2YWx1ZSArPSBjb3Jl LT5hWzJdOwotICB9Ci0gIGVsc2V7Ci0gICAgaWYoY29yZS0+YVswXSA9PSBjb3JlLT5hWzFdICYm IAotICAgICAgIGNvcmUtPmxvd2VyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFICYmIAotICAgICAg IGNvcmUtPnVwcGVyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFKSB7Ci0gICAgICB2YWx1ZSA9IGNv cmUtPmFbMF07Ci0gICAgfQotICAgIGVsc2UgewotICAgICAgZG8gewotCXZhbHVlID0gR0FSYW5k b21GbG9hdChjb3JlLT5hWzBdLCBjb3JlLT5hWzFdKTsKLSAgICAgIH0gd2hpbGUgKChjb3JlLT5s b3dlcmIgPT0gR0FBbGxlbGU6OkVYQ0xVU0lWRSAmJiB2YWx1ZSA9PSBjb3JlLT5hWzBdKSB8fAot CSAgICAgICAoY29yZS0+dXBwZXJiID09IEdBQWxsZWxlOjpFWENMVVNJVkUgJiYgdmFsdWUgPT0g Y29yZS0+YVsxXSkpOwotICAgIH0KLSAgfQotICByZXR1cm4gdmFsdWU7Ci19Ci0KLS8vIElmIHNv bWVvbmUgYXNrcyBmb3IgYSBkaXNjcmV0aXplZCBpdGVtIHRoYXQgaXMgYmV5b25kIHRoZSBib3Vu ZHMsIGdpdmUgdGhlbQotLy8gb25lIG9mIHRoZSBib3VuZHMuICBJZiB0aGV5IGFzayBmb3IgYWxs ZWxlIGl0ZW0gd2hlbiB0aGVyZSBpcyBubwotLy8gZGlzY3JldGl6YXRpb24gb3IgZW51bWVyYXRp b24sIHRoZW4gZXJyb3IgYW5kIHJldHVybiBsb3dlciBib3VuZC4KLWZsb2F0Ci1HQUFsbGVsZVNl dDxmbG9hdD46OmFsbGVsZSh1bnNpZ25lZCBpbnQgaSkgY29uc3QgewotICBmbG9hdCB2YWx1ZSA9 IDAuMDsKLSAgaWYoY29yZS0+dHlwZSA9PSBHQUFsbGVsZTo6RU5VTUVSQVRFRCkKLSAgICB2YWx1 ZSA9IGNvcmUtPmFbaSAlIGNvcmUtPnN6XTsKLSAgZWxzZSBpZihjb3JlLT50eXBlID09IEdBQWxs ZWxlOjpESVNDUkVUSVpFRCl7Ci0gICAgZmxvYXQgbiA9IChjb3JlLT5hWzFdIC0gY29yZS0+YVsw XSkvY29yZS0+YVsyXTsKLSAgICB1bnNpZ25lZCBpbnQgbSA9ICh1bnNpZ25lZCBpbnQpbjsgICAg ICAgICAgICAvLyB3aGF0IGFib3V0IGJvZ3VzIGxpbWl0cz8KLSAgICBpZihjb3JlLT5sb3dlcmIg PT0gR0FBbGxlbGU6OkVYQ0xVU0lWRSkgbSAtPSAxOwotICAgIGlmKGNvcmUtPnVwcGVyYiA9PSBH QUFsbGVsZTo6RVhDTFVTSVZFKSBtIC09IDE7Ci0gICAgaWYoaSA+IG0pIGkgPSAoaW50KW07Ci0g ICAgdmFsdWUgPSBjb3JlLT5hWzBdICsgaSpjb3JlLT5hWzJdOwotICAgIGlmKGNvcmUtPmxvd2Vy YiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFKSB2YWx1ZSArPSBjb3JlLT5hWzJdOwotICB9Ci0gIGVs c2V7Ci0gICAgR0FFcnIoR0FfTE9DLCAiR0FBbGxlbGVTZXQiLCAiYWxsZWxlIiwgZ2FFcnJOb0Fs bGVsZUluZGV4KTsKLSAgICB2YWx1ZSA9IGNvcmUtPmFbMF07Ci0gIH0KLSAgcmV0dXJuIHZhbHVl OwotfQotCi0KLQotCi0KLQotCiAvKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICBPcGVyYXRvciBz cGVjaWFsaXphdGlvbnMKIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKi8KQEAgLTMxNCwzICsyNTEsNCBA QAogdGVtcGxhdGUgY2xhc3MgR0ExREFycmF5QWxsZWxlR2Vub21lPGZsb2F0PjsKICNlbmRpZgog I2VuZGlmCisKZGlmZiAtTmF1ciBnYWxpYjI0NS1vcmlnL2dhL0dBUmVhbEdlbm9tZS5oIGdhbGli MjQ1L2dhL0dBUmVhbEdlbm9tZS5oCi0tLSBnYWxpYjI0NS1vcmlnL2dhL0dBUmVhbEdlbm9tZS5o CTIwMDQtMDUtMjMgMTU6MDk6MDEuNzYyMzM2NTI4ICswMjAwCisrKyBnYWxpYjI0NS9nYS9HQVJl YWxHZW5vbWUuaAkyMDA0LTA1LTIzIDE1OjE0OjA0LjYxMDI5NjY0MCArMDIwMApAQCAtMjAsNiAr MjAsNjIgQEAKIAogdHlwZWRlZiBHQTFEQXJyYXlBbGxlbGVHZW5vbWU8ZmxvYXQ+IEdBUmVhbEdl bm9tZTsKIAorLy8gV2UgbXVzdCBhbHNvIHNwZWNpYWxpemUgdGhlIGFsbGVsZSBzZXQgc28gdGhh dCB0aGUgYWxsZWxlcyBhcmUgaGFuZGxlZAorLy8gcHJvcGVybHkuICBCZSBzdXJlIHRvIGhhbmRs ZSBib3VuZHMgY29ycmVjdGx5IHdoZXRoZXIgd2UgYXJlIGRpc2NyZXRpemVkCisvLyBvciBjb250 aW51b3VzLiAgSGFuZGxlIHRoZSBjYXNlIHdoZXJlIHNvbWVvbmUgc2V0cyBzdHVwaWQgYm91bmRz IHRoYXQKKy8vIG1pZ2h0IGNhdXNlIGFuIGluZmluaXRlIGxvb3AgZm9yIGV4Y2x1c2l2ZSBib3Vu ZHMuCitmbG9hdAorR0FBbGxlbGVTZXQ8ZmxvYXQ+OjphbGxlbGUoKSBjb25zdCB7CisgIGZsb2F0 IHZhbHVlID0gMC4wOworICBpZihjb3JlLT50eXBlID09IEdBQWxsZWxlOjpFTlVNRVJBVEVEKQor ICAgIHZhbHVlID0gY29yZS0+YVtHQVJhbmRvbUludCgwLCBjb3JlLT5zei0xKV07CisgIGVsc2Ug aWYoY29yZS0+dHlwZSA9PSBHQUFsbGVsZTo6RElTQ1JFVElaRUQpeworICAgIGZsb2F0IG4gPSAo Y29yZS0+YVsxXSAtIGNvcmUtPmFbMF0pIC8gY29yZS0+YVsyXTsKKyAgICBpbnQgbSA9IChpbnQp bjsKKyAgICBpZihjb3JlLT5sb3dlcmIgPT0gR0FBbGxlbGU6OkVYQ0xVU0lWRSkgbSAtPSAxOwor ICAgIGlmKGNvcmUtPnVwcGVyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFKSBtIC09IDE7CisgICAg dmFsdWUgPSBjb3JlLT5hWzBdICsgR0FSYW5kb21JbnQoMCwoaW50KW0pICogY29yZS0+YVsyXTsK KyAgICBpZihjb3JlLT5sb3dlcmIgPT0gR0FBbGxlbGU6OkVYQ0xVU0lWRSkgdmFsdWUgKz0gY29y ZS0+YVsyXTsKKyAgfQorICBlbHNleworICAgIGlmKGNvcmUtPmFbMF0gPT0gY29yZS0+YVsxXSAm JgorICAgICAgIGNvcmUtPmxvd2VyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFICYmCisgICAgICAg Y29yZS0+dXBwZXJiID09IEdBQWxsZWxlOjpFWENMVVNJVkUpIHsKKyAgICAgIHZhbHVlID0gY29y ZS0+YVswXTsKKyAgICB9CisgICAgZWxzZSB7CisgICAgICBkbyB7CisgICAgdmFsdWUgPSBHQVJh bmRvbUZsb2F0KGNvcmUtPmFbMF0sIGNvcmUtPmFbMV0pOworICAgICAgfSB3aGlsZSAoKGNvcmUt Pmxvd2VyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFICYmIHZhbHVlID09IGNvcmUtPmFbMF0pIHx8 CisgICAgICAgICAgIChjb3JlLT51cHBlcmIgPT0gR0FBbGxlbGU6OkVYQ0xVU0lWRSAmJiB2YWx1 ZSA9PSBjb3JlLT5hWzFdKSk7CisgICAgfQorICB9CisgIHJldHVybiB2YWx1ZTsKK30KKworLy8g SWYgc29tZW9uZSBhc2tzIGZvciBhIGRpc2NyZXRpemVkIGl0ZW0gdGhhdCBpcyBiZXlvbmQgdGhl IGJvdW5kcywgZ2l2ZSB0aGVtCisvLyBvbmUgb2YgdGhlIGJvdW5kcy4gIElmIHRoZXkgYXNrIGZv ciBhbGxlbGUgaXRlbSB3aGVuIHRoZXJlIGlzIG5vCisvLyBkaXNjcmV0aXphdGlvbiBvciBlbnVt ZXJhdGlvbiwgdGhlbiBlcnJvciBhbmQgcmV0dXJuIGxvd2VyIGJvdW5kLmZsb2F0CitHQUFsbGVs ZVNldDxmbG9hdD46OmFsbGVsZSh1bnNpZ25lZCBpbnQgaSkgY29uc3QgeworICBmbG9hdCB2YWx1 ZSA9IDAuMDsKKyAgaWYoY29yZS0+dHlwZSA9PSBHQUFsbGVsZTo6RU5VTUVSQVRFRCkKKyAgICB2 YWx1ZSA9IGNvcmUtPmFbaSAlIGNvcmUtPnN6XTsKKyAgZWxzZSBpZihjb3JlLT50eXBlID09IEdB QWxsZWxlOjpESVNDUkVUSVpFRCl7CisgICAgZmxvYXQgbiA9IChjb3JlLT5hWzFdIC0gY29yZS0+ YVswXSkvY29yZS0+YVsyXTsKKyAgICB1bnNpZ25lZCBpbnQgbSA9ICh1bnNpZ25lZCBpbnQpbjsg ICAgICAgICAgICAvLyB3aGF0IGFib3V0IGJvZ3VzIGxpbWl0cz8KKyAgICBpZihjb3JlLT5sb3dl cmIgPT0gR0FBbGxlbGU6OkVYQ0xVU0lWRSkgbSAtPSAxOworICAgIGlmKGNvcmUtPnVwcGVyYiA9 PSBHQUFsbGVsZTo6RVhDTFVTSVZFKSBtIC09IDE7CisgICAgaWYoaSA+IG0pIGkgPSAoaW50KW07 CisgICAgdmFsdWUgPSBjb3JlLT5hWzBdICsgaSpjb3JlLT5hWzJdOworICAgIGlmKGNvcmUtPmxv d2VyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFKSB2YWx1ZSArPSBjb3JlLT5hWzJdOworICB9Cisg IGVsc2V7CisgICAgR0FFcnIoR0FfTE9DLCAiR0FBbGxlbGVTZXQiLCAiYWxsZWxlIiwgZ2FFcnJO b0FsbGVsZUluZGV4KTsKKyAgICB2YWx1ZSA9IGNvcmUtPmFbMF07CisgIH0KKyAgcmV0dXJuIHZh bHVlOworfQorCiBpbmxpbmUgdm9pZCBHQVJlYWxVbmlmb3JtSW5pdGlhbGl6ZXIoR0FHZW5vbWUm IGcpewogICBHQTFEQXJyYXlBbGxlbGVHZW5vbWU8ZmxvYXQ+OjpVbmlmb3JtSW5pdGlhbGl6ZXIo Zyk7CiB9Cg== 31889 2004-05-23 07:22 0000 files/patch-gcc3.patch patch-gcc3.patch text/plain ZGlmZiAtTmF1ciBnYWxpYjI0NS1vcmlnL2dhL0dBUmVhbEdlbm9tZS5DIGdhbGliMjQ1L2dhL0dB UmVhbEdlbm9tZS5DCi0tLSBnYWxpYjI0NS1vcmlnL2dhL0dBUmVhbEdlbm9tZS5DCTIwMDQtMDUt MjMgMTY6MDc6NDAuNDAwNDIyMjMyICswMjAwCisrKyBnYWxpYjI0NS9nYS9HQVJlYWxHZW5vbWUu QwkyMDA0LTA1LTIzIDE2OjEyOjAwLjE3MzkzMDY1NiArMDIwMApAQCAtNzcsNjkgKzc3LDYgQEAK IAogCiAKLS8vIFdlIG11c3QgYWxzbyBzcGVjaWFsaXplIHRoZSBhbGxlbGUgc2V0IHNvIHRoYXQg dGhlIGFsbGVsZXMgYXJlIGhhbmRsZWQKLS8vIHByb3Blcmx5LiAgQmUgc3VyZSB0byBoYW5kbGUg Ym91bmRzIGNvcnJlY3RseSB3aGV0aGVyIHdlIGFyZSBkaXNjcmV0aXplZAotLy8gb3IgY29udGlu dW91cy4gIEhhbmRsZSB0aGUgY2FzZSB3aGVyZSBzb21lb25lIHNldHMgc3R1cGlkIGJvdW5kcyB0 aGF0IAotLy8gbWlnaHQgY2F1c2UgYW4gaW5maW5pdGUgbG9vcCBmb3IgZXhjbHVzaXZlIGJvdW5k cy4KLWZsb2F0Ci1HQUFsbGVsZVNldDxmbG9hdD46OmFsbGVsZSgpIGNvbnN0IHsKLSAgZmxvYXQg dmFsdWUgPSAwLjA7Ci0gIGlmKGNvcmUtPnR5cGUgPT0gR0FBbGxlbGU6OkVOVU1FUkFURUQpCi0g ICAgdmFsdWUgPSBjb3JlLT5hW0dBUmFuZG9tSW50KDAsIGNvcmUtPnN6LTEpXTsKLSAgZWxzZSBp Zihjb3JlLT50eXBlID09IEdBQWxsZWxlOjpESVNDUkVUSVpFRCl7Ci0gICAgZmxvYXQgbiA9IChj b3JlLT5hWzFdIC0gY29yZS0+YVswXSkgLyBjb3JlLT5hWzJdOwotICAgIGludCBtID0gKGludClu OwotICAgIGlmKGNvcmUtPmxvd2VyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFKSBtIC09IDE7Ci0g ICAgaWYoY29yZS0+dXBwZXJiID09IEdBQWxsZWxlOjpFWENMVVNJVkUpIG0gLT0gMTsKLSAgICB2 YWx1ZSA9IGNvcmUtPmFbMF0gKyBHQVJhbmRvbUludCgwLChpbnQpbSkgKiBjb3JlLT5hWzJdOwot ICAgIGlmKGNvcmUtPmxvd2VyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFKSB2YWx1ZSArPSBjb3Jl LT5hWzJdOwotICB9Ci0gIGVsc2V7Ci0gICAgaWYoY29yZS0+YVswXSA9PSBjb3JlLT5hWzFdICYm IAotICAgICAgIGNvcmUtPmxvd2VyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFICYmIAotICAgICAg IGNvcmUtPnVwcGVyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFKSB7Ci0gICAgICB2YWx1ZSA9IGNv cmUtPmFbMF07Ci0gICAgfQotICAgIGVsc2UgewotICAgICAgZG8gewotCXZhbHVlID0gR0FSYW5k b21GbG9hdChjb3JlLT5hWzBdLCBjb3JlLT5hWzFdKTsKLSAgICAgIH0gd2hpbGUgKChjb3JlLT5s b3dlcmIgPT0gR0FBbGxlbGU6OkVYQ0xVU0lWRSAmJiB2YWx1ZSA9PSBjb3JlLT5hWzBdKSB8fAot CSAgICAgICAoY29yZS0+dXBwZXJiID09IEdBQWxsZWxlOjpFWENMVVNJVkUgJiYgdmFsdWUgPT0g Y29yZS0+YVsxXSkpOwotICAgIH0KLSAgfQotICByZXR1cm4gdmFsdWU7Ci19Ci0KLS8vIElmIHNv bWVvbmUgYXNrcyBmb3IgYSBkaXNjcmV0aXplZCBpdGVtIHRoYXQgaXMgYmV5b25kIHRoZSBib3Vu ZHMsIGdpdmUgdGhlbQotLy8gb25lIG9mIHRoZSBib3VuZHMuICBJZiB0aGV5IGFzayBmb3IgYWxs ZWxlIGl0ZW0gd2hlbiB0aGVyZSBpcyBubwotLy8gZGlzY3JldGl6YXRpb24gb3IgZW51bWVyYXRp b24sIHRoZW4gZXJyb3IgYW5kIHJldHVybiBsb3dlciBib3VuZC4KLWZsb2F0Ci1HQUFsbGVsZVNl dDxmbG9hdD46OmFsbGVsZSh1bnNpZ25lZCBpbnQgaSkgY29uc3QgewotICBmbG9hdCB2YWx1ZSA9 IDAuMDsKLSAgaWYoY29yZS0+dHlwZSA9PSBHQUFsbGVsZTo6RU5VTUVSQVRFRCkKLSAgICB2YWx1 ZSA9IGNvcmUtPmFbaSAlIGNvcmUtPnN6XTsKLSAgZWxzZSBpZihjb3JlLT50eXBlID09IEdBQWxs ZWxlOjpESVNDUkVUSVpFRCl7Ci0gICAgZmxvYXQgbiA9IChjb3JlLT5hWzFdIC0gY29yZS0+YVsw XSkvY29yZS0+YVsyXTsKLSAgICB1bnNpZ25lZCBpbnQgbSA9ICh1bnNpZ25lZCBpbnQpbjsgICAg ICAgICAgICAvLyB3aGF0IGFib3V0IGJvZ3VzIGxpbWl0cz8KLSAgICBpZihjb3JlLT5sb3dlcmIg PT0gR0FBbGxlbGU6OkVYQ0xVU0lWRSkgbSAtPSAxOwotICAgIGlmKGNvcmUtPnVwcGVyYiA9PSBH QUFsbGVsZTo6RVhDTFVTSVZFKSBtIC09IDE7Ci0gICAgaWYoaSA+IG0pIGkgPSAoaW50KW07Ci0g ICAgdmFsdWUgPSBjb3JlLT5hWzBdICsgaSpjb3JlLT5hWzJdOwotICAgIGlmKGNvcmUtPmxvd2Vy YiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFKSB2YWx1ZSArPSBjb3JlLT5hWzJdOwotICB9Ci0gIGVs c2V7Ci0gICAgR0FFcnIoR0FfTE9DLCAiR0FBbGxlbGVTZXQiLCAiYWxsZWxlIiwgZ2FFcnJOb0Fs bGVsZUluZGV4KTsKLSAgICB2YWx1ZSA9IGNvcmUtPmFbMF07Ci0gIH0KLSAgcmV0dXJuIHZhbHVl OwotfQotCi0KLQotCi0KLQotCiAvKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICBPcGVyYXRvciBz cGVjaWFsaXphdGlvbnMKIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKi8KQEAgLTMxNCwzICsyNTEsNCBA QAogdGVtcGxhdGUgY2xhc3MgR0ExREFycmF5QWxsZWxlR2Vub21lPGZsb2F0PjsKICNlbmRpZgog I2VuZGlmCisKZGlmZiAtTmF1ciBnYWxpYjI0NS1vcmlnL2dhL0dBUmVhbEdlbm9tZS5oIGdhbGli MjQ1L2dhL0dBUmVhbEdlbm9tZS5oCi0tLSBnYWxpYjI0NS1vcmlnL2dhL0dBUmVhbEdlbm9tZS5o CTIwMDQtMDUtMjMgMTY6MDc6NDAuNDAwNDIyMjMyICswMjAwCisrKyBnYWxpYjI0NS9nYS9HQVJl YWxHZW5vbWUuaAkyMDA0LTA1LTIzIDE2OjEyOjIxLjI1ODcyNTI4MCArMDIwMApAQCAtMjAsNiAr MjAsNjMgQEAKIAogdHlwZWRlZiBHQTFEQXJyYXlBbGxlbGVHZW5vbWU8ZmxvYXQ+IEdBUmVhbEdl bm9tZTsKIAorLy8gV2UgbXVzdCBhbHNvIHNwZWNpYWxpemUgdGhlIGFsbGVsZSBzZXQgc28gdGhh dCB0aGUgYWxsZWxlcyBhcmUgaGFuZGxlZAorLy8gcHJvcGVybHkuICBCZSBzdXJlIHRvIGhhbmRs ZSBib3VuZHMgY29ycmVjdGx5IHdoZXRoZXIgd2UgYXJlIGRpc2NyZXRpemVkCisvLyBvciBjb250 aW51b3VzLiAgSGFuZGxlIHRoZSBjYXNlIHdoZXJlIHNvbWVvbmUgc2V0cyBzdHVwaWQgYm91bmRz IHRoYXQKKy8vIG1pZ2h0IGNhdXNlIGFuIGluZmluaXRlIGxvb3AgZm9yIGV4Y2x1c2l2ZSBib3Vu ZHMuCitmbG9hdAorR0FBbGxlbGVTZXQ8ZmxvYXQ+OjphbGxlbGUoKSBjb25zdCB7CisgIGZsb2F0 IHZhbHVlID0gMC4wOworICBpZihjb3JlLT50eXBlID09IEdBQWxsZWxlOjpFTlVNRVJBVEVEKQor ICAgIHZhbHVlID0gY29yZS0+YVtHQVJhbmRvbUludCgwLCBjb3JlLT5zei0xKV07CisgIGVsc2Ug aWYoY29yZS0+dHlwZSA9PSBHQUFsbGVsZTo6RElTQ1JFVElaRUQpeworICAgIGZsb2F0IG4gPSAo Y29yZS0+YVsxXSAtIGNvcmUtPmFbMF0pIC8gY29yZS0+YVsyXTsKKyAgICBpbnQgbSA9IChpbnQp bjsKKyAgICBpZihjb3JlLT5sb3dlcmIgPT0gR0FBbGxlbGU6OkVYQ0xVU0lWRSkgbSAtPSAxOwor ICAgIGlmKGNvcmUtPnVwcGVyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFKSBtIC09IDE7CisgICAg dmFsdWUgPSBjb3JlLT5hWzBdICsgR0FSYW5kb21JbnQoMCwoaW50KW0pICogY29yZS0+YVsyXTsK KyAgICBpZihjb3JlLT5sb3dlcmIgPT0gR0FBbGxlbGU6OkVYQ0xVU0lWRSkgdmFsdWUgKz0gY29y ZS0+YVsyXTsKKyAgfQorICBlbHNleworICAgIGlmKGNvcmUtPmFbMF0gPT0gY29yZS0+YVsxXSAm JgorICAgICAgIGNvcmUtPmxvd2VyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFICYmCisgICAgICAg Y29yZS0+dXBwZXJiID09IEdBQWxsZWxlOjpFWENMVVNJVkUpIHsKKyAgICAgIHZhbHVlID0gY29y ZS0+YVswXTsKKyAgICB9CisgICAgZWxzZSB7CisgICAgICBkbyB7CisgICAgdmFsdWUgPSBHQVJh bmRvbUZsb2F0KGNvcmUtPmFbMF0sIGNvcmUtPmFbMV0pOworICAgICAgfSB3aGlsZSAoKGNvcmUt Pmxvd2VyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFICYmIHZhbHVlID09IGNvcmUtPmFbMF0pIHx8 CisgICAgICAgICAgIChjb3JlLT51cHBlcmIgPT0gR0FBbGxlbGU6OkVYQ0xVU0lWRSAmJiB2YWx1 ZSA9PSBjb3JlLT5hWzFdKSk7CisgICAgfQorICB9CisgIHJldHVybiB2YWx1ZTsKK30KKworLy8g SWYgc29tZW9uZSBhc2tzIGZvciBhIGRpc2NyZXRpemVkIGl0ZW0gdGhhdCBpcyBiZXlvbmQgdGhl IGJvdW5kcywgZ2l2ZSB0aGVtCisvLyBvbmUgb2YgdGhlIGJvdW5kcy4gIElmIHRoZXkgYXNrIGZv ciBhbGxlbGUgaXRlbSB3aGVuIHRoZXJlIGlzIG5vCisvLyBkaXNjcmV0aXphdGlvbiBvciBlbnVt ZXJhdGlvbiwgdGhlbiBlcnJvciBhbmQgcmV0dXJuIGxvd2VyIGJvdW5kLgorZmxvYXQKK0dBQWxs ZWxlU2V0PGZsb2F0Pjo6YWxsZWxlKHVuc2lnbmVkIGludCBpKSBjb25zdCB7CisgIGZsb2F0IHZh bHVlID0gMC4wOworICBpZihjb3JlLT50eXBlID09IEdBQWxsZWxlOjpFTlVNRVJBVEVEKQorICAg IHZhbHVlID0gY29yZS0+YVtpICUgY29yZS0+c3pdOworICBlbHNlIGlmKGNvcmUtPnR5cGUgPT0g R0FBbGxlbGU6OkRJU0NSRVRJWkVEKXsKKyAgICBmbG9hdCBuID0gKGNvcmUtPmFbMV0gLSBjb3Jl LT5hWzBdKS9jb3JlLT5hWzJdOworICAgIHVuc2lnbmVkIGludCBtID0gKHVuc2lnbmVkIGludClu OyAgICAgICAgICAgIC8vIHdoYXQgYWJvdXQgYm9ndXMgbGltaXRzPworICAgIGlmKGNvcmUtPmxv d2VyYiA9PSBHQUFsbGVsZTo6RVhDTFVTSVZFKSBtIC09IDE7CisgICAgaWYoY29yZS0+dXBwZXJi ID09IEdBQWxsZWxlOjpFWENMVVNJVkUpIG0gLT0gMTsKKyAgICBpZihpID4gbSkgaSA9IChpbnQp bTsKKyAgICB2YWx1ZSA9IGNvcmUtPmFbMF0gKyBpKmNvcmUtPmFbMl07CisgICAgaWYoY29yZS0+ bG93ZXJiID09IEdBQWxsZWxlOjpFWENMVVNJVkUpIHZhbHVlICs9IGNvcmUtPmFbMl07CisgIH0K KyAgZWxzZXsKKyAgICBHQUVycihHQV9MT0MsICJHQUFsbGVsZVNldCIsICJhbGxlbGUiLCBnYUVy ck5vQWxsZWxlSW5kZXgpOworICAgIHZhbHVlID0gY29yZS0+YVswXTsKKyAgfQorICByZXR1cm4g dmFsdWU7Cit9CisKIGlubGluZSB2b2lkIEdBUmVhbFVuaWZvcm1Jbml0aWFsaXplcihHQUdlbm9t ZSYgZyl7CiAgIEdBMURBcnJheUFsbGVsZUdlbm9tZTxmbG9hdD46OlVuaWZvcm1Jbml0aWFsaXpl cihnKTsKIH0K