From 6b1a43fd0712c15cb98f134bc2d8c89713b24513 Mon Sep 17 00:00:00 2001
From: Anirudh Ramachandran <avr@fb.com>
Date: Mon, 8 May 2017 12:21:47 -0700
Subject: [PATCH] Move OpenSSLPtrTypes.h from folly/io/async/ssl to folly/ssl

Summary:
There's nothing io/async/ssl-specific in this file. Moving to the
top-level directory will help this be more discoverable. Part of general cleanup
for io/async/ssl

Reviewed By: yfeldblum

Differential Revision: D5005566

fbshipit-source-id: 66a05a2139ee80a6d63791d1851da3f1858e8abf
---
 folly/Makefile.am                          | 2 +-
 folly/io/async/AsyncSSLSocket.h            | 2 +-
 folly/io/async/AsyncTransport.h            | 2 +-
 folly/io/async/SSLContext.h                | 2 +-
 folly/io/async/ssl/OpenSSLUtils.h          | 2 +-
 folly/ssl/OpenSSLCertUtils.cpp             | 2 +-
 folly/ssl/OpenSSLHash.h                    | 2 +-
 folly/{io/async => }/ssl/OpenSSLPtrTypes.h | 0
 folly/ssl/test/OpenSSLCertUtilsTest.cpp    | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename folly/{io/async => }/ssl/OpenSSLPtrTypes.h (100%)

diff --git a/folly/Makefile.am b/folly/Makefile.am
index 52ae0d49..f5f5a8fc 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -248,7 +248,6 @@ nobase_follyinclude_HEADERS = \
 	io/async/EventUtil.h \
 	io/async/NotificationQueue.h \
 	io/async/HHWheelTimer.h \
-	io/async/ssl/OpenSSLPtrTypes.h \
 	io/async/ssl/OpenSSLUtils.h \
 	io/async/ssl/SSLErrors.h \
 	io/async/ssl/TLSDefinitions.h \
@@ -360,6 +359,7 @@ nobase_follyinclude_HEADERS = \
 	SpookyHashV2.h \
 	ssl/OpenSSLCertUtils.h \
 	ssl/OpenSSLHash.h \
+	ssl/OpenSSLPtrTypes.h \
 	ssl/OpenSSLVersionFinder.h \
 	ssl/SSLSession.h \
 	ssl/detail/SSLSessionImpl.h \
diff --git a/folly/io/async/AsyncSSLSocket.h b/folly/io/async/AsyncSSLSocket.h
index 2121c2ff..accd120a 100644
--- a/folly/io/async/AsyncSSLSocket.h
+++ b/folly/io/async/AsyncSSLSocket.h
@@ -24,7 +24,7 @@
 #include <folly/io/async/AsyncTimeout.h>
 #include <folly/io/async/SSLContext.h>
 #include <folly/io/async/TimeoutManager.h>
-#include <folly/io/async/ssl/OpenSSLPtrTypes.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 #include <folly/io/async/ssl/OpenSSLUtils.h>
 #include <folly/io/async/ssl/SSLErrors.h>
 #include <folly/io/async/ssl/TLSDefinitions.h>
diff --git a/folly/io/async/AsyncTransport.h b/folly/io/async/AsyncTransport.h
index d20831f8..0c46ae64 100644
--- a/folly/io/async/AsyncTransport.h
+++ b/folly/io/async/AsyncTransport.h
@@ -22,7 +22,7 @@
 #include <folly/io/async/AsyncSocketBase.h>
 #include <folly/io/async/DelayedDestruction.h>
 #include <folly/io/async/EventBase.h>
-#include <folly/io/async/ssl/OpenSSLPtrTypes.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 #include <folly/portability/OpenSSL.h>
 #include <folly/portability/SysUio.h>
 
diff --git a/folly/io/async/SSLContext.h b/folly/io/async/SSLContext.h
index a381eb37..7b9d3b89 100644
--- a/folly/io/async/SSLContext.h
+++ b/folly/io/async/SSLContext.h
@@ -31,7 +31,7 @@
 #endif
 
 #include <folly/Range.h>
-#include <folly/io/async/ssl/OpenSSLPtrTypes.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 #include <folly/io/async/ssl/OpenSSLUtils.h>
 #include <folly/portability/OpenSSL.h>
 
diff --git a/folly/io/async/ssl/OpenSSLUtils.h b/folly/io/async/ssl/OpenSSLUtils.h
index 90135928..560d5cca 100644
--- a/folly/io/async/ssl/OpenSSLUtils.h
+++ b/folly/io/async/ssl/OpenSSLUtils.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <folly/Range.h>
-#include <folly/io/async/ssl/OpenSSLPtrTypes.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 #include <folly/portability/OpenSSL.h>
 #include <folly/portability/Sockets.h>
 
diff --git a/folly/ssl/OpenSSLCertUtils.cpp b/folly/ssl/OpenSSLCertUtils.cpp
index 10c5f996..b1bdf180 100644
--- a/folly/ssl/OpenSSLCertUtils.cpp
+++ b/folly/ssl/OpenSSLCertUtils.cpp
@@ -17,7 +17,7 @@
 
 #include <folly/ScopeGuard.h>
 #include <folly/String.h>
-#include <folly/io/async/ssl/OpenSSLPtrTypes.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 
 namespace folly {
 namespace ssl {
diff --git a/folly/ssl/OpenSSLHash.h b/folly/ssl/OpenSSLHash.h
index 481a4f3e..10e3e561 100644
--- a/folly/ssl/OpenSSLHash.h
+++ b/folly/ssl/OpenSSLHash.h
@@ -18,7 +18,7 @@
 
 #include <folly/Range.h>
 #include <folly/io/IOBuf.h>
-#include <folly/io/async/ssl/OpenSSLPtrTypes.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 #include <folly/portability/OpenSSL.h>
 
 namespace folly {
diff --git a/folly/io/async/ssl/OpenSSLPtrTypes.h b/folly/ssl/OpenSSLPtrTypes.h
similarity index 100%
rename from folly/io/async/ssl/OpenSSLPtrTypes.h
rename to folly/ssl/OpenSSLPtrTypes.h
diff --git a/folly/ssl/test/OpenSSLCertUtilsTest.cpp b/folly/ssl/test/OpenSSLCertUtilsTest.cpp
index 874edb60..a9ca22b2 100644
--- a/folly/ssl/test/OpenSSLCertUtilsTest.cpp
+++ b/folly/ssl/test/OpenSSLCertUtilsTest.cpp
@@ -18,7 +18,7 @@
 
 #include <folly/Range.h>
 #include <folly/String.h>
-#include <folly/io/async/ssl/OpenSSLPtrTypes.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 #include <folly/portability/GTest.h>
 #include <folly/portability/OpenSSL.h>
 
-- 
2.34.1