From 94770bbb3f8684c1cfa62f9a4f83cc70e4d7ef8f Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Mon, 29 Nov 2010 17:21:03 -0500 Subject: SH-531 / CTS-324 FIX fix of VWR-20749 / SNOW-624 lost in merge Re-applied fix originally committed in 1e93695ded30 Reveiewed code, appears straightforward. --- indra/newview/llcommandlineparser.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'indra/newview/llcommandlineparser.cpp') diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp index fb3db94c25..f31ff14df6 100644 --- a/indra/newview/llcommandlineparser.cpp +++ b/indra/newview/llcommandlineparser.cpp @@ -53,7 +53,7 @@ namespace po = boost::program_options; -// *NTOE:MEP - Currently the boost object reside in file scope. +// *NOTE:MEP - Currently the boost object reside in file scope. // This has a couple of negatives, they are always around and // there can be only one instance of each. // The plus is that the boost-ly-ness of this implementation is @@ -156,6 +156,12 @@ public: return mIsComposing; } + // Needed for boost 1.42 + virtual bool is_required() const + { + return false; // All our command line options are optional. + } + virtual bool apply_default(boost::any& value_store) const { return false; // No defaults. @@ -169,7 +175,6 @@ public: { mNotifyCallback(*value); } - } protected: -- cgit v1.2.3