From: Igor Sugak <sugak@fb.com>
Date: Sat, 14 Jan 2017 00:36:13 +0000 (-0800)
Subject: remove override from adjacent_tokens_only
X-Git-Tag: v2017.03.06.00~101
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=commitdiff_plain;h=ff66c8dcf1b022a2953cd9c10661b24d7bf04d1f

remove override from adjacent_tokens_only

Summary:
Our internal version of boost contains a patch that reverts the following commit to boost filesystem module:
https://github.com/boostorg/program_options/commit/88dea3c6fdea8c9ea894911897b1770599c383e4

It was done due to a breaking change that disallows the use of "--key value" for implicit options, allowing only "--key=value" style syntax. Since there are too many tests to fix, and it's probably going to be reverted in the upstream as well (see below), removing the `override` keyword here to fix folly build.

https://github.com/boostorg/program_options/issues/25

Reviewed By: meyering

Differential Revision: D4415347

fbshipit-source-id: c215331338b3aa218d26890a83aa0b363514fe79
---

diff --git a/folly/experimental/ProgramOptions.cpp b/folly/experimental/ProgramOptions.cpp
index e50f2655..73c471ff 100644
--- a/folly/experimental/ProgramOptions.cpp
+++ b/folly/experimental/ProgramOptions.cpp
@@ -83,7 +83,9 @@ class GFlagValueSemanticBase : public po::value_semantic {
 
   std::string name() const override { return "arg"; }
 #if BOOST_VERSION >= 105900
-  bool adjacent_tokens_only() const override { return false; }
+  bool adjacent_tokens_only() const {
+    return false;
+  }
 #endif
   bool is_composing() const override { return false; }
   bool is_required() const override { return false; }