widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1352943 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1352943 in widelands: "production_program.cc:249 Not implemented."
  https://bugs.launchpad.net/widelands/+bug/1352943

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1352943/+merge/236246

ProductionProgram::ActReturn::Negation dummies now return empty string instead of throwing an exception.

Verified that the "Skipped because...." etc. strings displayed on screen are still correct after this change.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1352943/+merge/236246
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1352943 into lp:widelands.

=== modified file 'src/logic/production_program.cc'
--- src/logic/production_program.cc	2014-09-14 11:31:58 +0000
+++ src/logic/production_program.cc	2014-09-28 09:25:16 +0000
@@ -242,18 +242,18 @@
 	return !operand->evaluate(ps);
 }
 
-// Just a dummy to satisfy the superclass interface. Do not use.
+// Just a dummy to satisfy the superclass interface. Returns an empty string.
 std::string ProductionProgram::ActReturn::Negation::description
 	(const TribeDescr &) const
 {
-	throw wexception("Not implemented.");
+	return "";
 }
 
-// Just a dummy to satisfy the superclass interface. Do not use.
+// Just a dummy to satisfy the superclass interface. Returns an empty string.
 std::string ProductionProgram::ActReturn::Negation::description_negation
 	(const TribeDescr &) const
 {
-	throw wexception("Not implemented.");
+	return "";
 }