Author: brunowolff
Date: Wed Mar 19 17:07:56 2008
New Revision: 24836
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24836&view=rev
Log:
Silence gcc warnings by adding parens around && clauses near ||.
Modified:
trunk/src/widgets/file_menu.cpp
Modified: trunk/src/widgets/file_menu.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/widgets/file_menu.cpp?rev=24836&r1=24835&r2=24836&view=diff
==============================================================================
--- trunk/src/widgets/file_menu.cpp (original)
+++ trunk/src/widgets/file_menu.cpp Wed Mar 19 17:07:56 2008
@@ -45,7 +45,7 @@
chosen_file_(start_file), last_selection_(-1)
{
// If the start file is not a file or directory, use the root.
- if(!file_exists(chosen_file_) && !::is_directory(chosen_file_)
+ if((!file_exists(chosen_file_) && !::is_directory(chosen_file_))
|| !::is_directory(current_dir_)) {
current_dir_ = path_delim;
chosen_file_ = current_dir_;
@@ -226,7 +226,7 @@
#ifdef __AMIGAOS4__
return path.size() == 0 || path[path.size()-1] == ':';
#else
- return path.size() == 0 || path.size() == 1 && path[0] == path_delim;
+ return path.size() == 0 || (path.size() == 1 && path[0] == path_delim);
#endif
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
