diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-08-18 13:01:56 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-08-18 13:01:56 +0100 |
| commit | 5bb7cbc663f77f6e75b8acac7ac4ec1fb346737d (patch) | |
| tree | 53c805e8cf8d753e4d9ae311988072a179f10743 | |
| parent | 6baedc137079752318ab9ea7af6a69be589d9c5a (diff) | |
VWR-20749 (SNOW-624) FIXED Fix compiling the viewer with Boost 1.42
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llcommandlineparser.cpp | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index f2f1d5af3f..9267d7ab08 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -151,6 +151,7 @@ blino Nakamura Boroondas Gupte SNOW-278 SNOW-527 + SNOW-624 VWR-233 WEB-262 Bulli Schumann diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp index 3f9e25518a..ee8646aad0 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: |