remove FOLLY_OVERRIDE usage in hphp

Summary: we currently have a mix of using 'override' and FOLLY_OVERRIDE so the macros do not help anything.

matches the removal of FOLLY_FINAL from hphp.

Reviewed By: @jdelong

Differential Revision: D1607671

hphp/runtime/base/directory.h

@@ -38,7 +38,7 @@ class Directory : public SweepableResourceData {
   virtual bool isEof() const {
     return false; // Most implementations can't tell if they've reached EOF
   }
-  void sweep() FOLLY_OVERRIDE { close(); }
+  void sweep() override { close(); }
 
   CLASSNAME_IS("Directory")
   // overriding ResourceData
@@ -76,7 +76,7 @@ class ArrayDirectory : public Directory {
   virtual void rewind();
   virtual bool isEof() const;
 
-  void sweep() FOLLY_OVERRIDE {
+  void sweep() override {
     // Leave m_it alone
     Directory::sweep();
   }

hphp/runtime/base/file.h

@@ -241,7 +241,7 @@ class File : public SweepableResourceData {
 
   void invokeFiltersOnClose();
   void closeImpl();
-  virtual void sweep() FOLLY_OVERRIDE;
+  virtual void sweep() override;
 
   /**
    * call readImpl(m_buffer, CHUNK_SIZE), passing through stream filters if any.

hphp/runtime/base/macros.h

@@ -92,13 +92,13 @@ namespace HPHP {
 
 #define DECLARE_RESOURCE_ALLOCATION(T)                                  \
   DECLARE_RESOURCE_ALLOCATION_NO_SWEEP(T)                               \
-  void sweep() FOLLY_OVERRIDE;
+  void sweep() override;
 
 #define DECLARE_OBJECT_ALLOCATION(T)                                    \
   static void typeCheck() {                                             \
     static_assert(std::is_base_of<ObjectData,T>::value, "");            \
   }                                                                     \
-  virtual void sweep() FOLLY_OVERRIDE;
+  virtual void sweep() override;
 
 #define IMPLEMENT_OBJECT_ALLOCATION(T)          \
   void HPHP::T::sweep() { this->~T(); }

hphp/runtime/base/plain-file.h

@@ -81,7 +81,7 @@ class BuiltinFile : public PlainFile {
   explicit BuiltinFile(int fd) : PlainFile(fd, true) {}
   virtual ~BuiltinFile();
   virtual bool close();
-  virtual void sweep() FOLLY_OVERRIDE;
+  virtual void sweep() override;
 };
 
 /**

hphp/runtime/base/resource-data.h

@@ -172,7 +172,7 @@ class ResourceData {
  */
 class SweepableResourceData : public ResourceData, public Sweepable {
 protected:
-  void sweep() FOLLY_OVERRIDE {
+  void sweep() override {
     // ResourceData objects are non-smart allocated by default (see
     // operator delete in ResourceData), so sweeping will destroy the
     // object and deallocate its seat as well.

hphp/runtime/base/socket.h

@@ -61,7 +61,7 @@ class Socket : public File {
   virtual bool eof();
   virtual Array getMetaData();
   virtual int64_t tell();
-  virtual void sweep() FOLLY_OVERRIDE;
+  virtual void sweep() override;
 
   // check if the socket is still open
   virtual bool checkLiveness();

hphp/runtime/base/ssl-socket.h

@@ -52,7 +52,7 @@ class SSLSocket : public Socket {
   SSLSocket();
   SSLSocket(int sockfd, int type, const char *address = nullptr, int port = 0);
   virtual ~SSLSocket();
-  void sweep() FOLLY_OVERRIDE;
+  void sweep() override;
 
   // will setup and enable crypto
   bool onConnect();
@@ -106,7 +106,7 @@ class Certificate : public SweepableResourceData {
   ~Certificate() {
     if (m_cert) X509_free(m_cert);
   }
-  void sweep() FOLLY_OVERRIDE {
+  void sweep() override {
     // calls delete this
     SweepableResourceData::sweep();
   }

hphp/runtime/base/user-directory.h

@@ -28,7 +28,7 @@ class UserDirectory : public Directory, public UserFSNode {
 
   explicit UserDirectory(Class* cls);
   ~UserDirectory() {}
-  void sweep() FOLLY_OVERRIDE {
+  void sweep() override {
     // Don't close like the parent, 'cause that's what zend does
   }
 

hphp/runtime/ext/ext_hash.cpp

@@ -164,7 +164,7 @@ class HashContext : public SweepableResourceData {
     HashContext::sweep();
   }
 
-  void sweep() FOLLY_OVERRIDE {
+  void sweep() override {
     /* Just in case the algo has internally allocated resources */
     if (context) {
       assert(ops->digest_size >= 0);

hphp/runtime/ext/ext_ipc.cpp

@@ -350,7 +350,7 @@ class Semaphore : public SweepableResourceData {
     Semaphore::sweep();
   }
 
-  void sweep() FOLLY_OVERRIDE {
+  void sweep() override {
     /*
      * if count == -1, semaphore has been removed
      * Need better way to handle this

hphp/runtime/ext/gd/ext_gd.h

@@ -38,7 +38,7 @@ class Image : public SweepableResourceData {
   Image() : m_gdImage(nullptr) {}
   explicit Image(gdImagePtr gdImage) : m_gdImage(gdImage) {}
   ~Image();
-  void sweep() FOLLY_OVERRIDE;
+  void sweep() override;
   gdImagePtr get() { return m_gdImage;}
   void reset() { m_gdImage = nullptr;}
 

hphp/runtime/ext/mcrypt/ext_mcrypt.cpp

@@ -40,7 +40,7 @@ class MCrypt : public SweepableResourceData {
     MCrypt::close();
   }
 
-  void sweep() FOLLY_OVERRIDE {
+  void sweep() override {
     close();
   }
 

hphp/runtime/ext/mysql/mysql_common.h

@@ -101,7 +101,7 @@ class MySQL : public SweepableResourceData {
         const char *password, const char *database,
         MYSQL* raw_connection = nullptr);
   ~MySQL();
-  void sweep() FOLLY_OVERRIDE;
+  void sweep() override;
   void setLastError(const char *func);
   void close();
 

hphp/runtime/ext/openssl/ext_openssl.cpp

@@ -163,7 +163,7 @@ class Key : public SweepableResourceData {
   ~Key() {
     if (m_key) EVP_PKEY_free(m_key);
   }
-  void sweep() FOLLY_OVERRIDE {
+  void sweep() override {
     // Base class calls delete this, which should work.
     SweepableResourceData::sweep();
   }
@@ -320,7 +320,7 @@ class CSRequest : public SweepableResourceData {
     X509_REQ_free(m_csr);
   }
 
-  void sweep() FOLLY_OVERRIDE {
+  void sweep() override {
     // Base class calls delete this, which should work.
     SweepableResourceData::sweep();
   }