Mark constexpr values needed within non-implicitly-capturing lambdas as static

[folly.git] / folly / Merge.h

diff --git a/folly/Merge.h b/folly/Merge.h
index 7e92c02905cfc2672a13e1037e36aa13bf7d60d9..f8d1fc1ea7d86549cb6bf373a7e92d24e8bfee75 100644 (file)
--- a/folly/Merge.h
+++ b/folly/Merge.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,8 +36,7 @@
  * from a.
  */
 
-#ifndef FOLLY_MERGE_H_
-#define FOLLY_MERGE_H_
+#pragma once
 
 #include <algorithm>
 
@@ -82,5 +81,3 @@ OutputIt merge(InputIt1 first1, InputIt1 last1,
 }
 
 }
-
-#endif