From: Tom Hughes <tom@compton.nu>
Date: Tue, 8 Sep 2015 01:23:00 +0000 (-0700)
Subject: Implement adjacent_tokens_only() for GFlagValueSemanticBase
X-Git-Tag: deprecate-dynamic-initializer~436
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=29193aca605bb93d82a3c92acd95bb342115f3a4;p=folly.git

Implement adjacent_tokens_only() for GFlagValueSemanticBase

Summary: Needed for boost 1.59.0 which added this as a pure virtual function
in the value_semantic base class. Fixes #314.
Closes #315

Reviewed By: @yfeldblum

Differential Revision: D2419035

Pulled By: @JoelMarcey
---

diff --git a/folly/experimental/ProgramOptions.cpp b/folly/experimental/ProgramOptions.cpp
index c5d37152..8146722e 100644
--- a/folly/experimental/ProgramOptions.cpp
+++ b/folly/experimental/ProgramOptions.cpp
@@ -19,6 +19,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
+#include <boost/version.hpp>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 #include <folly/Conv.h>
@@ -80,6 +81,9 @@ class GFlagValueSemanticBase : public po::value_semantic {
     : info_(std::move(info)) { }
 
   std::string name() const override { return "arg"; }
+#if BOOST_VERSION >= 105900
+  bool adjacent_tokens_only() const override { return false; }
+#endif
   bool is_composing() const override { return false; }
   bool is_required() const override { return false; }
   // We handle setting the GFlags from parse(), so notify() does nothing.