Add Optional::value_type

[folly.git] / folly / gen / Combine-inl.h

diff --git a/folly/gen/Combine-inl.h b/folly/gen/Combine-inl.h
index 667de7f230c529673bf767072812c9f7af8cf1c2..46386bdd04308a9c8785f00605aea2fc6609f9b7 100644 (file)
--- a/folly/gen/Combine-inl.h
+++ b/folly/gen/Combine-inl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Facebook, Inc.
+ * Copyright 2015 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -203,8 +203,6 @@ class MergeTuples {
 
 }  // namespace detail
 
-static const detail::Map<detail::MergeTuples> tuple_flatten;
-
 // TODO(mcurtiss): support zip() for N>1 operands. Because of variadic problems,
 // this might not be easily possible until gcc4.8 is available.
 template<class Source,