Use a constexpr char* under MSVC for the constexpr StringPiece test

[folly.git] / folly / Merge.h

diff --git a/folly/Merge.h b/folly/Merge.h
index 775d989b23812b30a320b5df2ab79a03204c40d6..51af2f825dba339e9fd3da77c1c01a570b4f1813 100644 (file)
--- a/folly/Merge.h
+++ b/folly/Merge.h
@@ -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