Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1100471-2013-04-24T17-04-59.855Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Validation queue job bug1100471-2013-04-24T17-04-59.855Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Line 73 in the diff is not a logically equivalent change. You should seek approval from whoever's code that is. I'll approve if that person approves. -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1100471 into
lp:zorba.
Commit message:
Solving windows warnings
Requested reviews:
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #1100471 in Zorba: Warnings on Windows
https://bugs.launchpad.net/zorba/+bug/1100471
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239
Solving windows warnings
--
https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/xquery_exception.h'
--- include/zorba/xquery_exception.h 2013-02-26 04:12:43 +
+++ include/zorba/xquery_exception.h 2013-04-16 21:15:35 +
@@ -295,7 +295,7 @@
* @return Returns \a true only if stack traces will be included.
*/
static bool get_print_trace( std::ostream o ) {
-return static_castprint_trace( o.iword( get_ios_trace_index() ) );
+return !!static_castprint_trace( o.iword( get_ios_trace_index() ) );
}
/**
@@ -404,7 +404,7 @@
*/
inline std::ostream operator( std::ostream o,
XQueryException::print_trace t ) {
- XQueryException::set_print_trace( o, t );
+ XQueryException::set_print_trace( o, !!t );
return o;
}
=== modified file 'src/api/base64_streambuf.cpp'
--- src/api/base64_streambuf.cpp 2013-02-07 17:24:36 +
+++ src/api/base64_streambuf.cpp 2013-04-16 21:15:35 +
@@ -156,8 +156,8 @@
// Get any chunk fragment pending the the get buffer first.
//
streamsize const n = min( gsize, size );
-traits_type::copy( to, gptr(), n );
-gbump( n );
+traits_type::copy( to, gptr(), static_castsize_t(n) );
+gbump( static_castint(n) );
to += n;
size -= n, return_size += n;
}
@@ -165,13 +165,13 @@
//
// Must get bytes in terms of encoded size.
//
- size = base64::encoded_size( size );
+ size = base64::encoded_size( static_castzorba::base64::size_type(size) );
while ( size ) {
char ebuf[ Large_External_Buf_Size ];
streamsize const get = min( (streamsize)(sizeof ebuf), size );
if ( streamsize got = orig_buf_-sgetn( ebuf, get ) ) {
- streamsize const decoded = base64::decode( ebuf, got, to );
+ streamsize const decoded = base64::decode( ebuf, static_castzorba::base64::size_type(got), to );
to += decoded;
size -= got, return_size += decoded;
} else
@@ -198,7 +198,7 @@
while ( size = 3 ) {
char ebuf[ Large_External_Buf_Size ];
streamsize const put = min( (streamsize)(sizeof ebuf), size );
-streamsize const encoded = base64::encode( from, put, ebuf );
+streamsize const encoded = base64::encode( from, static_castzorba::base64::size_type(put), ebuf );
orig_buf_-sputn( ebuf, encoded );
from += put, size -= put, return_size += put;
}
@@ -207,8 +207,8 @@
// Put any remaining chunk fragment into the put buffer.
//
if ( size ) {
-traits_type::copy( pbuf_, from, size );
-plen_ = size;
+traits_type::copy( pbuf_, from, static_castsize_t(size) );
+plen_ = static_castint(size);
}
return return_size;
=== modified file 'src/api/module_info_impl.cpp'
--- src/api/module_info_impl.cpp 2013-02-15 06:02:54 +
+++ src/api/module_info_impl.cpp 2013-04-16 21:15:35 +
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#include stdafx.h
#include api/module_info_impl.h
#include zorba/zorba_string.h
#include zorbatypes/zstring.h
=== modified file 'src/compiler/parser/jsoniq_parser.cpp'
--- src/compiler/parser/jsoniq_parser.cpp 2013-04-16 06:58:24 +
+++ src/compiler/parser/jsoniq_parser.cpp 2013-04-16 21:15:35 +
@@ -30,6 +30,7 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
+#include stdafx.h
// Take the name prefix into account.
#define yylex zorbalex
@@ -207,12 +208,12 @@
if (*++yyp != '\\')
goto do_not_strip_quotes;
/* Fall through. */
+case '':
+ return yyr;
default:
yyr += *yyp;
break;
-case '':
- return yyr;
}
do_not_strip_quotes: ;
}
@@ -247,11 +248,13 @@
{
YYUSE (yylocationp);
YYUSE (yyvaluep);
+/* useless
switch (yytype)
{
default:
break;
}
+*/
}
=== modified file 'src/compiler/parser/jsoniq_scanner.cpp'
--- src/compiler/parser/jsoniq_scanner.cpp 2013-04-16 06:58:24 +
+++ src/compiler/parser/jsoniq_scanner.cpp 2013-04-16 21:15:35 +
@@ -1,6 +1,7 @@
-#line 2 jsoniq_scanner.yy.cpp
+#include stdafx.h
+//#line 2 jsoniq_scanner.yy.cpp
-#line 4 jsoniq_scanner.yy.cpp
+//#line 4 jsoniq_scanner.yy.cpp
#define YY_INT_ALIGNED short int
@@ -6256,7 +6257,7 @@
if ( yyin-bad() )
return -1;
else
- return yyin-gcount();
+ return
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
I corrected all size_types only one warning couldn't solve, I don't know how to solve this: 1c:\dev\bug1100471\src\zorbatypes\integer.h(916): warning C4146: unary minus operator applied to unsigned type, result still unsigned (..\..\src\zorbatypes\integer.cpp) 1 c:\dev\bug1100471\src\zorbatypes\integer.h(915) : while compiling class template member function 'zorba::IntegerImplIntType zorba::IntegerImplIntType::operator -(void) const' 1 with 1 [ 1 IntType=unsigned __int64 1 ] 1 ..\..\src\zorbatypes\integer.cpp(453) : see reference to class template instantiation 'zorba::IntegerImplIntType' being compiled 1 with 1 [ 1 IntType=unsigned __int64 1 ] -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Commit Message changed to: Solving windows warnings For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Review: Needs Fixing You don't hack the parser.cpp or lexer.cpp files directly. Please revert ALL changes to those files and modify the .y or .l files ONLY. If the warnings still persist in those files due to generated code, it's simply too bad. In general, you don't need to fully qualify casts, e.g., you can do static_castsize_type(x) rather than static_castzorba::base64::size_type(x). I've fixed several formatting things (to put the code back to my style) and also a few other things. You should also seek approval from whoever else's code you touch. -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Done! I have made all the changes you observed. -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
213,222,231,240,243,252: should be cast to Members::size_type. 296,297: Should be vectorchar::size_type (why are you obsessing over std::string::size_type?) 310,319,332: Should be cast to checked_vectorstore::Item_t::size_type not size_t. 358,367,393,403,404,417: Cast to wrong type. It seems like you missed fixing a few. I also seems to be like you're simply guessing at what the correct type should be. Do you understand how to determine the correct type? -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Review: Needs Fixing In several cases where you added casts, you cast to the wrong type, e.g., the wrong size_type or something that should have been size_t. The only reason it got rid of the warnings in those cases is because the wrong type and the correct type just so happened to be the same underlying type on Windows; but that's not necessarily the case on non-Windows platforms. For example, in mem_streambuf.cpp, you cast size to string::size_type -- why? Strings have nothing to do with that code. If you looked at the man page for memcpy(3), the type of the 3rd argument is clearly size_t, so that's what you should have cast to. I've made corrections in my own code at least. In my code, I prefer !!expr rather than expr != 0 for conversion to bool (saves typing) -- I've changed this myself. In places where you added #ifdef __GNUC__, it would have been nice if you fixed the indentation and included the /* __GNUC__ */ comment on the #endif -- I've fixed this myself. As for other casts, I didn't thoroughly review them (you should do that, not me), but they looked suspicious to me: 209: It's not clear to me that the cast should be to int. It probably ought to be to whatever the type of theContent's size_type is (if it has one). 227,230,239: Here you're casting to unsigned int for theContent even though you just cast to int on line 209. Again, this should probably be some size_type. 252: Is unsigned long really correct for bytes_in_buffer? Is there a streamsize? 261: You fixed this line but ignored line 259 that obviously casts to a different type. 274: Is int really the right type? It probably should be theXmlTrees's size_type (if it has one). 283,296: Should probably be the type of the iterator's type's size_type. 322: Should probably be vectorstore::Item*::size_type not int. (To save typing, just add a typedef to the class for vectorstore::Item*.) 331,357: Should probably be theItems's type's size_type not unsigned int. Line numbers above refer to the line numbers of the diff on the launchpad merge proposal. -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in src/store/naive/simple_store.cpp -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1100471-2013-01-24T23-20-44.442Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Validation queue job bug1100471-2013-01-24T23-20-44.442Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
I'd actually prefer Paul to look at these, since he's the C++ guru and can hopefully say if there are any gotchas. -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Fixed the RQ problems, trying again. -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug1100471-2013-01-21T09-24-43.929Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1100471 into
lp:zorba.
Requested reviews:
Rodolfo Ochoa (rodolfo-ochoa)
Related bugs:
Bug #1100471 in Zorba: Warnings on Windows
https://bugs.launchpad.net/zorba/+bug/1100471
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035
Lots of warnings from windows fixed
--
https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/api/base64_streambuf.cpp'
--- src/api/base64_streambuf.cpp 2012-12-26 23:35:57 +
+++ src/api/base64_streambuf.cpp 2013-01-20 21:16:22 +
@@ -156,8 +156,8 @@
// Get any chunk fragment pending the the get buffer first.
//
streamsize const n = min( gsize, size );
-traits_type::copy( to, gptr(), n );
-gbump( n );
+traits_type::copy( to, gptr(), static_castsize_t(n) );
+gbump( static_castint(n) );
to += n;
size -= n, return_size += n;
}
@@ -165,13 +165,13 @@
//
// Must get bytes in terms of encoded size.
//
- size = base64::encoded_size( size );
+ size = base64::encoded_size( static_castsize_type(size) );
while ( size ) {
char ebuf[ Large_External_Buf_Size ];
streamsize const get = min( (streamsize)(sizeof ebuf), size );
if ( streamsize got = orig_buf_-sgetn( ebuf, get ) ) {
- streamsize const decoded = base64::decode( ebuf, got, to );
+ streamsize const decoded = base64::decode( ebuf, static_castsize_type(got), to );
to += decoded;
size -= got, return_size += decoded;
} else
@@ -198,7 +198,7 @@
while ( size = 3 ) {
char ebuf[ Large_External_Buf_Size ];
streamsize const put = min( (streamsize)(sizeof ebuf), size );
-streamsize const encoded = base64::encode( from, put, ebuf );
+streamsize const encoded = base64::encode( from, static_castsize_type(put), ebuf );
orig_buf_-sputn( ebuf, encoded );
from += put, size -= put, return_size += put;
}
@@ -207,8 +207,8 @@
// Put any remaining chunk fragment into the put buffer.
//
if ( size ) {
-traits_type::copy( pbuf_, from, size );
-plen_ = size;
+traits_type::copy( pbuf_, from, static_caststd::string::size_type(size) );
+plen_ = static_castint(size);
}
return return_size;
=== modified file 'src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp'
--- src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp 2012-12-18 15:57:51 +
+++ src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp 2013-01-20 21:16:22 +
@@ -1208,7 +1208,7 @@
void end_visit(const CollectionDecl n, void*)
{
- if ((!theOptions xqdoc_component_collections))
+ if ((!theOptions xqdoc_component_collections)!=0)
return;
store::Item_t lCollectionQName, lNameQName, lTypeQName;
=== modified file 'src/runtime/base64/base64_impl.cpp'
--- src/runtime/base64/base64_impl.cpp 2012-09-19 21:16:15 +
+++ src/runtime/base64/base64_impl.cpp 2013-01-20 21:16:22 +
@@ -113,7 +113,7 @@
while (lTranscoder.good())
{
lTranscoder.read(buf, 1024);
- lTranscodedString.append(buf, lTranscoder.gcount());
+ lTranscodedString.append(buf, static_caststd::string::size_type(lTranscoder.gcount()));
}
GENV_ITEMFACTORY-createString(result, lTranscodedString);
}
=== modified file 'src/runtime/datetime/datetime_impl.cpp'
--- src/runtime/datetime/datetime_impl.cpp 2013-01-08 00:31:47 +
+++ src/runtime/datetime/datetime_impl.cpp 2013-01-20 21:16:22 +
@@ -49,10 +49,10 @@
::memset( tm, 0, sizeof( *tm ) );
time::parse( buf, fmt, lang, country, tm, set_fields );
-bool set_mday = set_fields time::set_mday;
-bool set_mon = set_fields time::set_mon;
-bool const set_yday = set_fields time::set_yday;
-bool const set_year = set_fields time::set_year;
+bool set_mday = ((set_fields time::set_mday)!=0);
+bool set_mon = ((set_fields time::set_mon) !=0);
+bool const set_yday = ((set_fields time::set_yday)!=0);
+bool const set_year = ((set_fields time::set_year)!=0);
if ( set_yday set_year (!set_mday || !set_mon) ) {
//
=== modified file 'src/runtime/full_text/ft_module_impl.cpp'
--- src/runtime/full_text/ft_module_impl.cpp 2013-01-04 16:08:03 +
+++ src/runtime/full_text/ft_module_impl.cpp 2013-01-20 21:16:22 +
@@ -345,7 +345,7 @@
consumeNext( item, theChildren[0], plan_state );
try {
-is_supported = ft_stop_words_set::get_default( get_lang_from( item, loc ) );
+is_supported = (ft_stop_words_set::get_default( get_lang_from( item, loc ) )!=0);
}
catch ( ZorbaException const e ) {
if ( e.diagnostic() != err::FTST0009 /* lang not supported */ )
@@ -605,7 +605,7 @@
);
ZORBA_ASSERT( state-tresult_.get() );
}
-
+#ifdef __GNUC__
#ifdef GCC_PRAGMA_DIAGNOSTIC_PUSH
# pragma GCC diagnostic pop
#else
@@ -613,7 +613,7
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Commit Message changed to: Lots of warnings from windows fixed For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1100471-2013-01-20T21-18-47.689Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug1100471-2013-01-20T21-18-47.689Z is finished. The final status was: 21 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/144035 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1100471 into
lp:zorba.
Requested reviews:
Rodolfo Ochoa (rodolfo-ochoa)
Related bugs:
Bug #1100471 in Zorba: Warnings on Windows
https://bugs.launchpad.net/zorba/+bug/1100471
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/143997
Fix for Windows bugs and locale compilation error
--
https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/143997
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/api/base64_streambuf.cpp'
--- src/api/base64_streambuf.cpp 2012-12-26 23:35:57 +
+++ src/api/base64_streambuf.cpp 2013-01-19 19:41:21 +
@@ -156,8 +156,8 @@
// Get any chunk fragment pending the the get buffer first.
//
streamsize const n = min( gsize, size );
-traits_type::copy( to, gptr(), n );
-gbump( n );
+traits_type::copy( to, gptr(), static_castsize_t(n) );
+gbump( static_castint(n) );
to += n;
size -= n, return_size += n;
}
@@ -165,13 +165,13 @@
//
// Must get bytes in terms of encoded size.
//
- size = base64::encoded_size( size );
+ size = base64::encoded_size( static_castsize_type(size) );
while ( size ) {
char ebuf[ Large_External_Buf_Size ];
streamsize const get = min( (streamsize)(sizeof ebuf), size );
if ( streamsize got = orig_buf_-sgetn( ebuf, get ) ) {
- streamsize const decoded = base64::decode( ebuf, got, to );
+ streamsize const decoded = base64::decode( ebuf, static_castsize_type(got), to );
to += decoded;
size -= got, return_size += decoded;
} else
@@ -198,7 +198,7 @@
while ( size = 3 ) {
char ebuf[ Large_External_Buf_Size ];
streamsize const put = min( (streamsize)(sizeof ebuf), size );
-streamsize const encoded = base64::encode( from, put, ebuf );
+streamsize const encoded = base64::encode( from, static_castsize_type(put), ebuf );
orig_buf_-sputn( ebuf, encoded );
from += put, size -= put, return_size += put;
}
@@ -207,8 +207,8 @@
// Put any remaining chunk fragment into the put buffer.
//
if ( size ) {
-traits_type::copy( pbuf_, from, size );
-plen_ = size;
+traits_type::copy( pbuf_, from, static_caststd::string::size_type(size) );
+plen_ = static_castint(size);
}
return return_size;
=== modified file 'src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp'
--- src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp 2012-12-18 15:57:51 +
+++ src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp 2013-01-19 19:41:21 +
@@ -1208,7 +1208,7 @@
void end_visit(const CollectionDecl n, void*)
{
- if ((!theOptions xqdoc_component_collections))
+ if ((!theOptions xqdoc_component_collections)!=0)
return;
store::Item_t lCollectionQName, lNameQName, lTypeQName;
=== modified file 'src/runtime/base64/base64_impl.cpp'
--- src/runtime/base64/base64_impl.cpp 2012-09-19 21:16:15 +
+++ src/runtime/base64/base64_impl.cpp 2013-01-19 19:41:21 +
@@ -113,7 +113,7 @@
while (lTranscoder.good())
{
lTranscoder.read(buf, 1024);
- lTranscodedString.append(buf, lTranscoder.gcount());
+ lTranscodedString.append(buf, static_caststd::string::size_type(lTranscoder.gcount()));
}
GENV_ITEMFACTORY-createString(result, lTranscodedString);
}
=== modified file 'src/runtime/datetime/datetime_impl.cpp'
--- src/runtime/datetime/datetime_impl.cpp 2013-01-08 00:31:47 +
+++ src/runtime/datetime/datetime_impl.cpp 2013-01-19 19:41:21 +
@@ -49,10 +49,10 @@
::memset( tm, 0, sizeof( *tm ) );
time::parse( buf, fmt, lang, country, tm, set_fields );
-bool set_mday = set_fields time::set_mday;
-bool set_mon = set_fields time::set_mon;
-bool const set_yday = set_fields time::set_yday;
-bool const set_year = set_fields time::set_year;
+bool set_mday = ((set_fields time::set_mday)!=0);
+bool set_mon = ((set_fields time::set_mon) !=0);
+bool const set_yday = ((set_fields time::set_yday)!=0);
+bool const set_year = ((set_fields time::set_year)!=0);
if ( set_yday set_year (!set_mday || !set_mon) ) {
//
=== modified file 'src/runtime/full_text/ft_module_impl.cpp'
--- src/runtime/full_text/ft_module_impl.cpp 2013-01-04 16:08:03 +
+++ src/runtime/full_text/ft_module_impl.cpp 2013-01-19 19:41:21 +
@@ -345,7 +345,7 @@
consumeNext( item, theChildren[0], plan_state );
try {
-is_supported = ft_stop_words_set::get_default( get_lang_from( item, loc ) );
+is_supported = (ft_stop_words_set::get_default( get_lang_from( item, loc ) )!=0);
}
catch ( ZorbaException const e ) {
if ( e.diagnostic() != err::FTST0009 /* lang not supported */ )
@@ -605,7 +605,7 @@
);
ZORBA_ASSERT( state-tresult_.get() );
}
-
+#ifdef __GNUC__
#ifdef GCC_PRAGMA_DIAGNOSTIC_PUSH
# pragma GCC diagnostic pop
#else
@@
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/143997 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/143997 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Commit Message changed to: Fix for Windows bugs and locale compilation error For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/143997 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/143997 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/143997 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/143997 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/143997 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/143997 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug1100471-2013-01-20T00-03-03.437Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/143997 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/143997 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/143997 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1100471-2013-01-20T00-03-03.437Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/143997 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
