Fri Jul 5 21:34:12 2013 UTC ()
operator bool doesn't equal good(), but !bad(). This makes a difference
when it comes to handling EOF. Adjust.


(joerg)
diff -r1.14 -r1.15 pkgsrc/graphics/openimageio/Makefile
diff -r1.5 -r1.6 pkgsrc/graphics/openimageio/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/openimageio/patches/patch-psd.imageio_psdinput.cpp
diff -r1.33 -r1.34 pkgsrc/ham/fldigi/Makefile
diff -r1.13 -r1.14 pkgsrc/ham/fldigi/distinfo
diff -r1.1 -r1.2 pkgsrc/ham/fldigi/patches/patch-src_navtex_navtex.cxx
diff -r1.17 -r1.18 pkgsrc/net/synergy/Makefile
diff -r1.10 -r1.11 pkgsrc/net/synergy/distinfo
diff -r1.1 -r1.2 pkgsrc/net/synergy/patches/patch-src_lib_server_CConfig.cpp
cvs diff -r1.14 -r1.15 pkgsrc/graphics/openimageio/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/openimageio/Makefile 2013/06/06 12:53:42 1.14
+++ pkgsrc/graphics/openimageio/Makefile 2013/07/05 21:34:11 1.15
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.14 2013/06/06 12:53:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.15 2013/07/05 21:34:11 joerg Exp $
2 2
3OIIOVER= 1.1.7 3OIIOVER= 1.1.7
4DISTNAME= oiio-Release-${OIIOVER} 4DISTNAME= oiio-Release-${OIIOVER}
5PKGNAME= ${DISTNAME:S/oiio-Release/openimageio/} 5PKGNAME= ${DISTNAME:S/oiio-Release/openimageio/}
6PKGREVISION= 4 6PKGREVISION= 5
7CATEGORIES= graphics 7CATEGORIES= graphics
8MASTER_SITES= -https://github.com/OpenImageIO/oiio/archive/Release-${OIIOVER}.tar.gz 8MASTER_SITES= -https://github.com/OpenImageIO/oiio/archive/Release-${OIIOVER}.tar.gz
9FETCH_USING= curl 9FETCH_USING= curl
10 10
11MAINTAINER= ryoon@NetBSD.org 11MAINTAINER= ryoon@NetBSD.org
12HOMEPAGE= https://sites.google.com/site/openimageio/ 12HOMEPAGE= https://sites.google.com/site/openimageio/
13COMMENT= OpenImageIO is a library for reading and writing images 13COMMENT= OpenImageIO is a library for reading and writing images
14LICENSE= modified-bsd 14LICENSE= modified-bsd
15 15
16WRKSRC= ${WRKDIR}/${DISTNAME}/src 16WRKSRC= ${WRKDIR}/${DISTNAME}/src
17 17
18USE_CMAKE= yes 18USE_CMAKE= yes
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
cvs diff -r1.5 -r1.6 pkgsrc/graphics/openimageio/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/openimageio/distinfo 2013/05/09 13:58:54 1.5
+++ pkgsrc/graphics/openimageio/distinfo 2013/07/05 21:34:11 1.6
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.5 2013/05/09 13:58:54 joerg Exp $ 1$NetBSD: distinfo,v 1.6 2013/07/05 21:34:11 joerg Exp $
2 2
3SHA1 (oiio-Release-1.1.7.tar.gz) = 435286ffad18169fd615cd33d95c2b49d3e4ec17 3SHA1 (oiio-Release-1.1.7.tar.gz) = 435286ffad18169fd615cd33d95c2b49d3e4ec17
4RMD160 (oiio-Release-1.1.7.tar.gz) = dfe15e32ff0c821165079bf517cf11dd87146ccc 4RMD160 (oiio-Release-1.1.7.tar.gz) = dfe15e32ff0c821165079bf517cf11dd87146ccc
5Size (oiio-Release-1.1.7.tar.gz) = 8300700 bytes 5Size (oiio-Release-1.1.7.tar.gz) = 8300700 bytes
6SHA1 (patch-CMakeLists.txt) = 2923ca84d7981aaaf6494588392444e5ee07f74a 6SHA1 (patch-CMakeLists.txt) = 2923ca84d7981aaaf6494588392444e5ee07f74a
7SHA1 (patch-cmake_modules_FindOpenJpeg.cmake) = 20d15c8ee0a25ab631ed39910b6e441d069760c5 7SHA1 (patch-cmake_modules_FindOpenJpeg.cmake) = 20d15c8ee0a25ab631ed39910b6e441d069760c5
8SHA1 (patch-cmake_oiio__macros.cmake) = 016c4792c1dc85a903477f4c72af26577e1b2bb9 8SHA1 (patch-cmake_oiio__macros.cmake) = 016c4792c1dc85a903477f4c72af26577e1b2bb9
9SHA1 (patch-cmake_platform.cmake) = bb3ef743bdb04a76efcabb745af62473205e01ae 9SHA1 (patch-cmake_platform.cmake) = bb3ef743bdb04a76efcabb745af62473205e01ae
10SHA1 (patch-dpx.imageio_libdpx_DPXColorConverter.cpp) = 595415e7e2897798df76474dd906e25cdf3a929e 10SHA1 (patch-dpx.imageio_libdpx_DPXColorConverter.cpp) = 595415e7e2897798df76474dd906e25cdf3a929e
11SHA1 (patch-include_pugixml.hpp) = 242a95507b970c3cef94099d49fc2326b79bd23b 11SHA1 (patch-include_pugixml.hpp) = 242a95507b970c3cef94099d49fc2326b79bd23b
12SHA1 (patch-include_tbb_tbb__exception.h) = b2e98d44666d8a113dd6f21f2300ffdd8af3e20c 12SHA1 (patch-include_tbb_tbb__exception.h) = b2e98d44666d8a113dd6f21f2300ffdd8af3e20c
13SHA1 (patch-include_tbb_tbb__machine.h) = 7d9a196397315e0d39dd2f16139e011ab84c5630 13SHA1 (patch-include_tbb_tbb__machine.h) = 7d9a196397315e0d39dd2f16139e011ab84c5630
14SHA1 (patch-include_tbb_tbb__misc.h) = 27995a9cdb72b182e352b2a649756af2d60fec86 14SHA1 (patch-include_tbb_tbb__misc.h) = 27995a9cdb72b182e352b2a649756af2d60fec86
15SHA1 (patch-libutil_sysutil.cpp) = b7484aef56ea239bae20faba1f04c14907557485 15SHA1 (patch-libutil_sysutil.cpp) = b7484aef56ea239bae20faba1f04c14907557485
16SHA1 (patch-make_detectplatform.mk) = a399f09b9280109519a829dbacc1b924a074f4cc 16SHA1 (patch-make_detectplatform.mk) = a399f09b9280109519a829dbacc1b924a074f4cc
17SHA1 (patch-psd.imageio_psdinput.cpp) = 234d617fb02b094e418ad3480888e51a1ec8f3d1 17SHA1 (patch-psd.imageio_psdinput.cpp) = 9387715224c93aff28bac55bfc54a435d1de7c1f
18SHA1 (patch-ptex.imageio_ptex_PtexPlatform.h) = 3c32f95181cfcf8c0e67249a4d04f7ea14a5e122 18SHA1 (patch-ptex.imageio_ptex_PtexPlatform.h) = 3c32f95181cfcf8c0e67249a4d04f7ea14a5e122
cvs diff -r1.1 -r1.2 pkgsrc/graphics/openimageio/patches/Attic/patch-psd.imageio_psdinput.cpp (expand / switch to unified diff)

--- pkgsrc/graphics/openimageio/patches/Attic/patch-psd.imageio_psdinput.cpp 2013/05/09 13:58:54 1.1
+++ pkgsrc/graphics/openimageio/patches/Attic/patch-psd.imageio_psdinput.cpp 2013/07/05 21:34:12 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-psd.imageio_psdinput.cpp,v 1.1 2013/05/09 13:58:54 joerg Exp $ 1$NetBSD: patch-psd.imageio_psdinput.cpp,v 1.2 2013/07/05 21:34:12 joerg Exp $
2 2
3--- psd.imageio/psdinput.cpp.orig 2013-02-21 17:10:46.000000000 +0000 3--- psd.imageio/psdinput.cpp.orig 2013-02-21 17:10:46.000000000 +0000
4+++ psd.imageio/psdinput.cpp 4+++ psd.imageio/psdinput.cpp
5@@ -328,7 +328,7 @@ private: 5@@ -328,7 +328,7 @@ private:
6 // For debugging, numeric_cast will throw if precision is lost: 6 // For debugging, numeric_cast will throw if precision is lost:
7 // value = boost::numeric_cast<TVariable>(buffer); 7 // value = boost::numeric_cast<TVariable>(buffer);
8 value = buffer; 8 value = buffer;
9- return m_file; 9- return m_file;
10+ return m_file.good(); 10+ return !m_file.bad();
11 } 11 }
12  12
13 int read_pascal_string (std::string &s, uint16_t mod_padding); 13 int read_pascal_string (std::string &s, uint16_t mod_padding);
cvs diff -r1.33 -r1.34 pkgsrc/ham/fldigi/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/fldigi/Makefile 2013/05/31 12:41:10 1.33
+++ pkgsrc/ham/fldigi/Makefile 2013/07/05 21:34:12 1.34
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.33 2013/05/31 12:41:10 wiz Exp $ 1# $NetBSD: Makefile,v 1.34 2013/07/05 21:34:12 joerg Exp $
2# 2#
3 3
4DISTNAME= fldigi-3.21.70 4DISTNAME= fldigi-3.21.70
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= ham 6CATEGORIES= ham
7MASTER_SITES= http://www.w1hkj.com/downloads/fldigi/ 7MASTER_SITES= http://www.w1hkj.com/downloads/fldigi/
8LICENSE= gnu-gpl-v3 8LICENSE= gnu-gpl-v3
9 9
10MAINTAINER= makoto@ki.nu 10MAINTAINER= makoto@ki.nu
11HOMEPAGE= http://www.w1hkj.com/Fldigi.html 11HOMEPAGE= http://www.w1hkj.com/Fldigi.html
12#HOMEPAGE= http://lists.berlios.de/mailman/listinfo/fldigi-devel 12#HOMEPAGE= http://lists.berlios.de/mailman/listinfo/fldigi-devel
13COMMENT= Digital radio modem 13COMMENT= Digital radio modem
14 14
15USE_TOOLS+= gmake pkg-config 15USE_TOOLS+= gmake pkg-config
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18 18
cvs diff -r1.13 -r1.14 pkgsrc/ham/fldigi/distinfo (expand / switch to unified diff)

--- pkgsrc/ham/fldigi/distinfo 2013/05/09 14:09:13 1.13
+++ pkgsrc/ham/fldigi/distinfo 2013/07/05 21:34:12 1.14
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.13 2013/05/09 14:09:13 mef Exp $ 1$NetBSD: distinfo,v 1.14 2013/07/05 21:34:12 joerg Exp $
2 2
3SHA1 (fldigi-3.21.70.tar.gz) = 670700583404205990c7b7229eb6e75909698e63 3SHA1 (fldigi-3.21.70.tar.gz) = 670700583404205990c7b7229eb6e75909698e63
4RMD160 (fldigi-3.21.70.tar.gz) = bcbb75218cc79d4662bf4bd07ed206823d9c953e 4RMD160 (fldigi-3.21.70.tar.gz) = bcbb75218cc79d4662bf4bd07ed206823d9c953e
5Size (fldigi-3.21.70.tar.gz) = 2145803 bytes 5Size (fldigi-3.21.70.tar.gz) = 2145803 bytes
6SHA1 (patch-src_dominoex_dominoex.cxx) = f1f94bb21856f1911c75ee0a138170fba17432b4 6SHA1 (patch-src_dominoex_dominoex.cxx) = f1f94bb21856f1911c75ee0a138170fba17432b4
7SHA1 (patch-src_include_qrunner.h) = 575a142fa935be760e6d440de5b6d965c6259388 7SHA1 (patch-src_include_qrunner.h) = 575a142fa935be760e6d440de5b6d965c6259388
8SHA1 (patch-src_logbook_logsupport.cxx) = f5540103677064d8a6da61db8f445b792729305c 8SHA1 (patch-src_logbook_logsupport.cxx) = f5540103677064d8a6da61db8f445b792729305c
9SHA1 (patch-src_misc_dxcc.cxx) = 05fe507377334dd2787a76395dec21afeacf499a 9SHA1 (patch-src_misc_dxcc.cxx) = 05fe507377334dd2787a76395dec21afeacf499a
10SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c 10SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c
11SHA1 (patch-src_misc_re.cxx) = 9daf70fa7844546e6ad761b5bdf924b6de74843c 11SHA1 (patch-src_misc_re.cxx) = 9daf70fa7844546e6ad761b5bdf924b6de74843c
12SHA1 (patch-src_navtex_navtex.cxx) = 13c70ecfa6c7052c0e42bbbc9829d559b6ea2cd3 12SHA1 (patch-src_navtex_navtex.cxx) = 689581bfedf83416baf876ef1c51769ce673b9d8
13SHA1 (patch-src_spot_notify.cxx) = e0f2889f1ae2405326b2883f13f618c3d9bfd412 13SHA1 (patch-src_spot_notify.cxx) = e0f2889f1ae2405326b2883f13f618c3d9bfd412
14SHA1 (patch-src_spot_pskrep.cxx) = 1ea5838d80224b06fe940802f4f6ee7ac4207a72 14SHA1 (patch-src_spot_pskrep.cxx) = 1ea5838d80224b06fe940802f4f6ee7ac4207a72
15SHA1 (patch-src_spot_spot.cxx) = e69b10e9f9e884d3ef3cf5bb18d882cb1a5db5a7 15SHA1 (patch-src_spot_spot.cxx) = e69b10e9f9e884d3ef3cf5bb18d882cb1a5db5a7
16SHA1 (patch-src_thor_thor.cxx) = 7df1c77f79f9746e243440740bb35994a09ac66e 16SHA1 (patch-src_thor_thor.cxx) = 7df1c77f79f9746e243440740bb35994a09ac66e
17SHA1 (patch-src_xmlrpcpp_XmlRpcClient.cpp) = 5d7aab9e194cd51ca0bd56430e751db1491dd1f7 17SHA1 (patch-src_xmlrpcpp_XmlRpcClient.cpp) = 5d7aab9e194cd51ca0bd56430e751db1491dd1f7
18SHA1 (patch-src_xmlrpcpp_XmlRpcServer.cpp) = 30da72b30c6f66ecaa1e05ac1b53450db9a1c2cc 18SHA1 (patch-src_xmlrpcpp_XmlRpcServer.cpp) = 30da72b30c6f66ecaa1e05ac1b53450db9a1c2cc
19SHA1 (patch-src_xmlrpcpp_base64.h) = 1f1b27e010c5e4ce0f9d5b0bf4a729eefc7535ac 19SHA1 (patch-src_xmlrpcpp_base64.h) = 1f1b27e010c5e4ce0f9d5b0bf4a729eefc7535ac
cvs diff -r1.1 -r1.2 pkgsrc/ham/fldigi/patches/Attic/patch-src_navtex_navtex.cxx (expand / switch to unified diff)

--- pkgsrc/ham/fldigi/patches/Attic/patch-src_navtex_navtex.cxx 2013/05/06 14:49:32 1.1
+++ pkgsrc/ham/fldigi/patches/Attic/patch-src_navtex_navtex.cxx 2013/07/05 21:34:12 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-src_navtex_navtex.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $ 1$NetBSD: patch-src_navtex_navtex.cxx,v 1.2 2013/07/05 21:34:12 joerg Exp $
2 2
3--- src/navtex/navtex.cxx.orig 2013-05-03 14:31:34.000000000 +0000 3--- src/navtex/navtex.cxx.orig 2013-05-03 14:31:34.000000000 +0000
4+++ src/navtex/navtex.cxx 4+++ src/navtex/navtex.cxx
5@@ -177,12 +177,12 @@ bool read_until_delim( std::istream & is 5@@ -177,12 +177,12 @@ bool read_until_delim( std::istream & is
6 if( ! std::getline( istrm, parsed_str, delim ) ) return false ; 6 if( ! std::getline( istrm, parsed_str, delim ) ) return false ;
7 std::stringstream sstrm( parsed_str ); 7 std::stringstream sstrm( parsed_str );
8 sstrm >> ref ; 8 sstrm >> ref ;
9- return sstrm ; 9- return sstrm ;
10+ return sstrm.good(); 10+ return !sstrm.bad();
11 } 11 }
12  12
13 static bool read_until_delim( std::istream & istrm, std::string & ref ) 13 static bool read_until_delim( std::istream & istrm, std::string & ref )
14 { 14 {
15- return std::getline( istrm, ref, delim ); 15- return std::getline( istrm, ref, delim );
16+ return std::getline( istrm, ref, delim ).good(); 16+ return !std::getline( istrm, ref, delim ).bad();
17 } 17 }
18  18
19 class NavtexRecord 19 class NavtexRecord
cvs diff -r1.17 -r1.18 pkgsrc/net/synergy/Makefile (expand / switch to unified diff)

--- pkgsrc/net/synergy/Makefile 2013/05/11 21:40:14 1.17
+++ pkgsrc/net/synergy/Makefile 2013/07/05 21:34:12 1.18
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.17 2013/05/11 21:40:14 joerg Exp $ 1# $NetBSD: Makefile,v 1.18 2013/07/05 21:34:12 joerg Exp $
2# 2#
3 3
4DISTNAME= synergy-1.3.8-Source 4DISTNAME= synergy-1.3.8-Source
5PKGNAME= ${DISTNAME:S/-Source//} 5PKGNAME= ${DISTNAME:S/-Source//}
 6PKGREVISION= 1
6CATEGORIES= net x11 7CATEGORIES= net x11
7MASTER_SITES= http://synergy.googlecode.com/files/ 8MASTER_SITES= http://synergy.googlecode.com/files/
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://synergy-foss.org/ 11HOMEPAGE= http://synergy-foss.org/
11COMMENT= Let a user share a mouse and keyboard among computers 12COMMENT= Let a user share a mouse and keyboard among computers
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
15 16
16EXAMPLES= MacReadme.txt org.synergy-foss.org.synergyc.plist \ 17EXAMPLES= MacReadme.txt org.synergy-foss.org.synergyc.plist \
17 org.synergy-foss.org.synergys.plist synergy.conf.example \ 18 org.synergy-foss.org.synergys.plist synergy.conf.example \
18 synergy.conf.example-advanced synergy.conf.example-basic 19 synergy.conf.example-advanced synergy.conf.example-basic
cvs diff -r1.10 -r1.11 pkgsrc/net/synergy/distinfo (expand / switch to unified diff)

--- pkgsrc/net/synergy/distinfo 2013/05/11 21:40:14 1.10
+++ pkgsrc/net/synergy/distinfo 2013/07/05 21:34:12 1.11
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.10 2013/05/11 21:40:14 joerg Exp $ 1$NetBSD: distinfo,v 1.11 2013/07/05 21:34:12 joerg Exp $
2 2
3SHA1 (synergy-1.3.8-Source.tar.gz) = 82e80b22c6746e573d047aa4a1ad7b71c28cf7d3 3SHA1 (synergy-1.3.8-Source.tar.gz) = 82e80b22c6746e573d047aa4a1ad7b71c28cf7d3
4RMD160 (synergy-1.3.8-Source.tar.gz) = 3b02faec3b5e5dbea1853e6decd92e4cf6eca419 4RMD160 (synergy-1.3.8-Source.tar.gz) = 3b02faec3b5e5dbea1853e6decd92e4cf6eca419
5Size (synergy-1.3.8-Source.tar.gz) = 2518396 bytes 5Size (synergy-1.3.8-Source.tar.gz) = 2518396 bytes
6SHA1 (patch-src_lib_server_CConfig.cpp) = 47cb18b62cfd9eeee08cc5ee24e7777de98fefd2 6SHA1 (patch-src_lib_server_CConfig.cpp) = 14b5434c3fe33efde44f26fd14da6897229aacc9
7SHA1 (patch-src_lib_server_CConfig.h) = 6aa99efc189a3d8e067a30f4fee4d94874e4f3c6 7SHA1 (patch-src_lib_server_CConfig.h) = 6aa99efc189a3d8e067a30f4fee4d94874e4f3c6
8SHA1 (patch-tools_gmock-1.6.0_configure) = 45cfbcdc8b55c1e745265ed4e2bbbfe41ef000a2 8SHA1 (patch-tools_gmock-1.6.0_configure) = 45cfbcdc8b55c1e745265ed4e2bbbfe41ef000a2
9SHA1 (patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h) = dc526bcfab414dcd35d3d67c36998d92020bd398 9SHA1 (patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h) = dc526bcfab414dcd35d3d67c36998d92020bd398
10SHA1 (patch-tools_gtest-1.6.0_configure) = 35d77cab8e651bff031294f7d12570cb582aba1a 10SHA1 (patch-tools_gtest-1.6.0_configure) = 35d77cab8e651bff031294f7d12570cb582aba1a
11SHA1 (patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h) = 518067092fe4209bfc28f3bb4eb4092d1b0c1304 11SHA1 (patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h) = 518067092fe4209bfc28f3bb4eb4092d1b0c1304
cvs diff -r1.1 -r1.2 pkgsrc/net/synergy/patches/Attic/patch-src_lib_server_CConfig.cpp (expand / switch to unified diff)

--- pkgsrc/net/synergy/patches/Attic/patch-src_lib_server_CConfig.cpp 2013/05/11 21:40:14 1.1
+++ pkgsrc/net/synergy/patches/Attic/patch-src_lib_server_CConfig.cpp 2013/07/05 21:34:12 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-src_lib_server_CConfig.cpp,v 1.1 2013/05/11 21:40:14 joerg Exp $ 1$NetBSD: patch-src_lib_server_CConfig.cpp,v 1.2 2013/07/05 21:34:12 joerg Exp $
2 2
3--- src/lib/server/CConfig.cpp.orig 2011-01-21 03:51:35.000000000 +0000 3--- src/lib/server/CConfig.cpp.orig 2011-01-21 03:51:35.000000000 +0000
4+++ src/lib/server/CConfig.cpp 4+++ src/lib/server/CConfig.cpp
5@@ -1908,9 +1908,9 @@ CConfigReadContext::getLineNumber() cons 5@@ -1908,9 +1908,9 @@ CConfigReadContext::getLineNumber() cons
6 return m_line; 6 return m_line;
7 } 7 }
8  8
9-CConfigReadContext::operator void*() const 9-CConfigReadContext::operator void*() const
10+CConfigReadContext::operator bool() const 10+CConfigReadContext::operator bool() const
11 { 11 {
12- return m_stream; 12- return m_stream;
13+ return m_stream.good(); 13+ return !m_stream.bad();
14 } 14 }
15  15
16 bool 16 bool