Make BackupContainerFileSystem.h a non-actor file

fdbclient/BackupContainer.actor.cpp

@@ -37,7 +37,7 @@
 #include "flow/Platform.h"
 #include "fdbclient/AsyncFileBlobStore.actor.h"
 #include "fdbclient/BackupContainerAzureBlobStore.h"
-#include "fdbclient/BackupContainerFileSystem.actor.h"
+#include "fdbclient/BackupContainerFileSystem.h"
 #include "fdbclient/BackupContainerLocalDirectory.h"
 #include "fdbclient/BackupContainerS3BlobStore.h"
 #include "fdbclient/Status.h"

fdbclient/BackupContainerAzureBlobStore.h

@@ -22,7 +22,7 @@
 #define FDBCLIENT_BACKUP_CONTAINER_AZURE_BLOBSTORE_H
 #pragma once
 
-#include "fdbclient/BackupContainerFileSystem.actor.h"
+#include "fdbclient/BackupContainerFileSystem.h"
 
 #include "storage_credential.h"
 #include "storage_account.h"

fdbclient/BackupContainerFileSystem.actor.cpp

@@ -19,7 +19,7 @@
  */
 
 #include "fdbclient/BackupContainerAzureBlobStore.h"
-#include "fdbclient/BackupContainerFileSystem.actor.h"
+#include "fdbclient/BackupContainerFileSystem.h"
 #include "fdbclient/BackupContainerLocalDirectory.h"
 #include "fdbclient/FDBTypes.h"
 

fdbclient/BackupContainerFileSystem.h

@@ -1,5 +1,5 @@
 /*
- * BackupContainerFileSystem.actor.h
+ * BackupContainerFileSystem.h
  *
  * This source file is part of the FoundationDB open source project
  *
@@ -18,12 +18,9 @@
  * limitations under the License.
  */
 
-#pragma once
-#if defined(NO_INTELLISENSE) && !defined(FDBCLIENT_BACKUP_CONTAINER_FILESYSTEM_ACTOR_G_H)
-#define FDBCLIENT_BACKUP_CONTAINER_FILESYSTEM_ACTOR_G_H
-#include "fdbclient/BackupContainerFileSystem.actor.g.h"
-#elif !defined(FDBCLIENT_BACKUP_CONTAINER_FILESYSTEM_H)
+#ifndef FDBCLIENT_BACKUP_CONTAINER_FILESYSTEM_H
 #define FDBCLIENT_BACKUP_CONTAINER_FILESYSTEM_H
+#pragma once
 
 // FIXME: Trim this down
 #include "flow/Platform.actor.h"
@@ -50,7 +47,6 @@
 #include <time.h>
 
 #include "fdbclient/BackupContainer.h"
-#include "flow/actorcompiler.h" // has to be last include
 
 /* BackupContainerFileSystem implements a backup container which stores files in a nested folder structure.
  * Inheritors must only defined methods for writing, reading, deleting, sizing, and listing files.
@@ -276,5 +272,4 @@ public:
 	VersionProperty logType();
 };
 
-#include "flow/unactorcompiler.h"
 #endif

fdbclient/BackupContainerLocalDirectory.h

@@ -22,7 +22,7 @@
 #define FDBCLIENT_BACKUP_CONTAINER_LOCAL_DIRECTORY_H
 #pragma once
 
-#include "fdbclient/BackupContainerFileSystem.actor.h"
+#include "fdbclient/BackupContainerFileSystem.h"
 
 class BackupContainerLocalDirectory : public BackupContainerFileSystem,
                                       ReferenceCounted<BackupContainerLocalDirectory> {

fdbclient/BackupContainerS3BlobStore.h

@@ -22,7 +22,7 @@
 #define FDBCLIENT_BACKUP_CONTAINER_S3_BLOBSTORE_H
 #pragma once
 
-#include "fdbclient/BackupContainerFileSystem.actor.h"
+#include "fdbclient/BackupContainerFileSystem.h"
 
 class BackupContainerS3BlobStore final : public BackupContainerFileSystem,
                                          ReferenceCounted<BackupContainerS3BlobStore> {

fdbclient/CMakeLists.txt

@@ -11,7 +11,7 @@ set(FDBCLIENT_SRCS
   BackupContainerAzureBlobStore.actor.cpp
   BackupContainerAzureBlobStore.h
   BackupContainerFileSystem.actor.cpp
-  BackupContainerFileSystem.actor.h
+  BackupContainerFileSystem.h
   BackupContainerLocalDirectory.actor.cpp
   BackupContainerLocalDirectory.h
   BackupContainerS3BlobStore.actor.cpp