use pragma once in headers

Makefile

@@ -92,10 +92,8 @@ authors:
 
 src/version.hpp:
 	$(eval VERSION := $(shell $(GIT) describe --always --tags --dirty))
-	@echo "#ifndef _VERSION_HPP" > src/version.hpp
+	@echo "#pragma once" > src/version.hpp
-	@echo "#define _VERSION_HPP" >> src/version.hpp
 	@echo "static const char MERGERFS_VERSION[] = \"$(VERSION)\";" >> src/version.hpp
-	@echo "#endif" >> src/version.hpp
 
 obj/obj-stamp:
 	$(MKDIR) -p obj

src/access.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __ACCESS_HPP__
+#pragma once
-#define __ACCESS_HPP__
 
 namespace mergerfs
 {
@@ -26,5 +25,3 @@ namespace mergerfs
            int         mask);
   }
 }
-
-#endif

src/assert.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __ASSERT_HPP__
+#pragma once
-#define __ASSERT_HPP__
 
 #define STATIC_ASSERT(cond) assert::StaticAssert< (cond) >()
 #define STATIC_ARRAYLENGTH_ASSERT(array,size) STATIC_ASSERT(((sizeof(array)/sizeof(array[0]))==(size)))
@@ -29,5 +28,3 @@ namespace assert
   struct StaticAssert<true>
   {};
 }
-
-#endif

src/buildmap.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __BUILDMAP_HPP__
+#pragma once
-#define __BUILDMAP_HPP__
 
 #include <algorithm>
 
@@ -44,5 +43,3 @@ public:
 private:
   std::map<K,V> _map;
 };
-
-#endif

src/buildvector.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __BUILDVECTOR_HPP__
+#pragma once
-#define __BUILDVECTOR_HPP__
 
 #include <algorithm>
 
@@ -44,5 +43,3 @@ public:
 private:
   std::vector<V> _vector;
 };
-
-#endif

src/category.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __CATEGORY_HPP__
+#pragma once
-#define __CATEGORY_HPP__
 
 #include <string>
 #include <vector>
@@ -86,5 +85,3 @@ namespace mergerfs
     static const Category              &search;
   };
 }
-
-#endif

src/chmod.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __CHMOD_HPP__
+#pragma once
-#define __CHMOD_HPP__
 
 namespace mergerfs
 {
@@ -26,5 +25,3 @@ namespace mergerfs
           mode_t      mode);
   }
 }
-
-#endif

src/chown.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __CHOWN_HPP__
+#pragma once
-#define __CHOWN_HPP__
 
 namespace mergerfs
 {
@@ -27,5 +26,3 @@ namespace mergerfs
           gid_t       gid);
   }
 }
-
-#endif

src/config.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __CONFIG_HPP__
+#pragma once
-#define __CONFIG_HPP__
 
 #include <fuse.h>
 
@@ -106,5 +105,3 @@ namespace mergerfs
     }
   };
 }
-
-#endif

src/create.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __CREATE_HPP__
+#pragma once
-#define __CREATE_HPP__
 
 #include <fuse.h>
 
@@ -31,5 +30,3 @@ namespace mergerfs
            fuse_file_info *ffi);
   }
 }
-
-#endif

src/destroy.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __DESTROY_HPP__
+#pragma once
-#define __DESTROY_HPP__
 
 namespace mergerfs
 {
@@ -25,5 +24,3 @@ namespace mergerfs
     destroy(void *);
   }
 }
-
-#endif

src/dirinfo.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __DIRINFO_HPP__
+#pragma once
-#define __DIRINFO_HPP__
 
 #include <string>
 
@@ -30,5 +29,3 @@ public:
 public:
   std::string fusepath;
 };
-
-#endif

src/errno.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __ERRNO_HPP__
+#pragma once
-#define __ERRNO_HPP__
 
 #include <errno.h>
 
@@ -30,5 +29,3 @@
 #if !defined(ENOATTR) && !defined(ENODATA)
 #error "Neither ENOATTR or ENODATA defined: please contact mergerfs author with platform information"
 #endif
-
-#endif

src/fallocate.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FALLOCATE_HPP__
+#pragma once
-#define __FALLOCATE_HPP__
 
 namespace mergerfs
 {
@@ -29,5 +28,3 @@ namespace mergerfs
               fuse_file_info *fi);
   }
 }
-
-#endif

src/fgetattr.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FGETATTR_HPP__
+#pragma once
-#define __FGETATTR_HPP__
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -31,5 +30,3 @@ namespace mergerfs
              fuse_file_info *fileinfo);
   }
 }
-
-#endif

src/fileinfo.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FILEINFO_HPP__
+#pragma once
-#define __FILEINFO_HPP__
 
 #include <string>
 
@@ -33,5 +32,3 @@ public:
   int fd;
   std::string fusepath;
 };
-
-#endif

src/flock.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FLOCK_HPP__
+#pragma once
-#define __FLOCK_HPP__
 
 namespace mergerfs
 {
@@ -27,5 +26,3 @@ namespace mergerfs
           int             op);
   }
 }
-
-#endif

src/flush.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FLUSH_HPP__
+#pragma once
-#define __FLUSH_HPP__
 
 namespace mergerfs
 {
@@ -26,5 +25,3 @@ namespace mergerfs
           fuse_file_info *fi);
   }
 }
-
-#endif

src/fs.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_HPP__
+#pragma once
-#define __FS_HPP__
 
 #include <string>
 #include <vector>
@@ -67,5 +66,3 @@ namespace fs
           const uint64_t        minfreespace,
           string               &path);
 };
-
-#endif // __FS_HPP__

src/fs_acl.hpp

@@ -16,6 +16,8 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#pragma once
+
 #include <string>
 
 namespace fs

src/fs_attr.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_ATTR_HPP__
+#pragma once
-#define __FS_ATTR_HPP__
 
 #include <string>
 
@@ -31,5 +30,3 @@ namespace fs
              const string &to);
   }
 }
-
-#endif // __FS_ATTR_HPP__

src/fs_base_access.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_ACCESS_HPP__
+#pragma once
-#define __FS_BASE_ACCESS_HPP__
 
 #include <string>
 
@@ -56,5 +55,3 @@ namespace fs
     return fs::access(path,mode,AT_EACCESS);
   }
 }
-
-#endif

src/fs_base_chmod.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_CHMOD_HPP__
+#pragma once
-#define __FS_BASE_CHMOD_HPP__
 
 #include <sys/stat.h>
 
@@ -106,5 +105,3 @@ namespace fs
     return 0;
   }
 }
-
-#endif

src/fs_base_chown.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_CHOWN_HPP__
+#pragma once
-#define __FS_BASE_CHOWN_HPP__
 
 #include <string>
 
@@ -140,5 +139,3 @@ namespace fs
     return 0;
   }
 }
-
-#endif

src/fs_base_close.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_CLOSE_HPP__
+#pragma once
-#define __FS_BASE_CLOSE_HPP__
 
 #include <unistd.h>
 
@@ -31,5 +30,3 @@ namespace fs
     return ::close(fd);
   }
 }
-
-#endif

src/fs_base_closedir.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_CLOSEDIR_HPP__
+#pragma once
-#define __FS_BASE_CLOSEDIR_HPP__
 
 #include <dirent.h>
 #include <sys/types.h>
@@ -32,5 +31,3 @@ namespace fs
     return ::closedir(dirp);
   }
 }
-
-#endif

src/fs_base_dirfd.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_DIRFD_HPP__
+#pragma once
-#define __FS_DIRFD_HPP__
 
 #include <dirent.h>
 #include <sys/types.h>
@@ -32,5 +31,3 @@ namespace fs
     return ::dirfd(dirp);
   }
 }
-
-#endif

src/fs_base_dup.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_DUP_HPP__
+#pragma once
-#define __FS_BASE_DUP_HPP__
 
 #include <unistd.h>
 
@@ -31,5 +30,3 @@ namespace fs
     return ::dup(fd);
   }
 }
-
-#endif

src/fs_base_fadvise.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_FADVISE_HPP__
+#pragma once
-#define __FS_BASE_FADVISE_HPP__
 
 namespace fs
 {
@@ -34,5 +33,3 @@ namespace fs
                      const off_t offset = 0,
                      const off_t len    = 0);
 }
-
-#endif // __FS_FADVISE_HPP__

src/fs_base_fallocate.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_FALLOCATE_HPP__
+#pragma once
-#define __FS_BASE_FALLOCATE_HPP__
 
 #include <fcntl.h>
 
@@ -27,5 +26,3 @@ namespace fs
             const off_t offset,
             const off_t len);
 }
-
-#endif

src/fs_base_flock.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_FLOCK_HPP__
+#pragma once
-#define __FS_BASE_FLOCK_HPP__
 
 #include <sys/file.h>
 
@@ -32,5 +31,3 @@ namespace fs
     return ::flock(fd,operation);
   }
 }
-
-#endif

src/fs_base_fsync.hpp

@@ -16,17 +16,16 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_FSYNC_HPP__
+#pragma once
-#define __FS_BASE_FSYNC_HPP__
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
 
-#include <unistd.h>
-
 #include "errno.hpp"
 
+#include <unistd.h>
+
 namespace fs
 {
   static
@@ -49,5 +48,3 @@ namespace fs
 #endif
   }
 }
-
-#endif

src/fs_base_ftruncate.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_FTRUNCATE_HPP__
+#pragma once
-#define __FS_BASE_FTRUNCATE_HPP__
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -33,5 +32,3 @@ namespace fs
     return ::ftruncate(fd,size);
   }
 }
-
-#endif

src/fs_base_futimesat.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_FUTIMESAT_HPP__
+#pragma once
-#define __FS_BASE_FUTIMESAT_HPP__
 
 namespace fs
 {
@@ -26,5 +25,3 @@ namespace fs
             const char           *pathname,
             const struct timeval  times[2]);
 }
-
-#endif

src/fs_base_getxattr.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_GETXATTR_HPP__
+#pragma once
-#define __FS_BASE_GETXATTR_HPP__
 
 #include <sys/types.h>
 
@@ -41,5 +40,3 @@ namespace fs
 #endif
   }
 }
-
-#endif

src/fs_base_ioctl.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_IOCTL_HPP__
+#pragma once
-#define __FS_BASE_IOCTL_HPP__
 
 #include <sys/ioctl.h>
 
@@ -33,5 +32,3 @@ namespace fs
     return ::ioctl(fd,request,data);
   }
 }
-
-#endif

src/fs_base_link.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_LINK_HPP__
+#pragma once
-#define __FS_BASE_LINK_HPP__
 
 #include <string>
 
@@ -34,5 +33,3 @@ namespace fs
     return ::link(oldpath.c_str(),newpath.c_str());
   }
 }
-
-#endif

src/fs_base_listxattr.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_LISTXATTR_HPP__
+#pragma once
-#define __FS_BASE_LISTXATTR_HPP__
 
 #include <sys/types.h>
 
@@ -40,5 +39,3 @@ namespace fs
 #endif
   }
 }
-
-#endif

src/fs_base_lseek.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_LSEEK_HPP__
+#pragma once
-#define __FS_BASE_LSEEK_HPP__
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -34,5 +33,3 @@ namespace fs
     return ::lseek(fd,offset,whence);
   }
 }
-
-#endif

src/fs_base_mkdir.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_MKDIR_HPP__
+#pragma once
-#define __FS_BASE_MKDIR_HPP__
 
 #include <string>
 
@@ -35,5 +34,3 @@ namespace fs
     return ::mkdir(path.c_str(),mode);
   }
 }
-
-#endif

src/fs_base_mknod.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_MKNOD_HPP__
+#pragma once
-#define __FS_BASE_MKNOD_HPP__
 
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -36,5 +35,3 @@ namespace fs
     return ::mknod(path.c_str(),mode,dev);
   }
 }
-
-#endif

src/fs_base_mkstemp.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_MKSTEMP_HPP__
+#pragma once
-#define __FS_BASE_MKSTEMP_HPP__
 
 #include <stdlib.h>
 #include <string.h>
@@ -46,5 +45,3 @@ namespace fs
     return fd;
   }
 }
-
-#endif

src/fs_base_open.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_OPEN_HPP__
+#pragma once
-#define __FS_BASE_OPEN_HPP__
 
 #include <string>
 
@@ -46,5 +45,3 @@ namespace fs
     return ::open(path.c_str(),flags,mode);
   }
 }
-
-#endif

src/fs_base_opendir.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_OPENDIR_HPP__
+#pragma once
-#define __FS_BASE_OPENDIR_HPP__
 
 #include <string>
 
@@ -34,5 +33,3 @@ namespace fs
     return ::opendir(name.c_str());
   }
 }
-
-#endif

src/fs_base_read.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_READ_HPP__
+#pragma once
-#define __FS_BASE_READ_HPP__
 
 #include <unistd.h>
 
@@ -44,5 +43,3 @@ namespace fs
     return ::pread(fd,buf,count,offset);
   }
 }
-
-#endif

src/fs_base_readdir.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_READDIR_HPP__
+#pragma once
-#define __FS_BASE_READDIR_HPP__
 
 #include <dirent.h>
 
@@ -31,5 +30,3 @@ namespace fs
     return ::readdir(dirp);
   }
 }
-
-#endif

src/fs_base_readlink.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_READLINK_HPP__
+#pragma once
-#define __FS_BASE_READLINK_HPP__
 
 #include <string>
 
@@ -35,5 +34,3 @@ namespace fs
     return ::readlink(path.c_str(),buf,bufsiz);
   }
 }
-
-#endif

src/fs_base_realpath.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_REALPATH_HPP__
+#pragma once
-#define __FS_BASE_REALPATH_HPP__
 
 #include <string>
 
@@ -43,5 +42,3 @@ namespace fs
     return fs::realpath(path,NULL);
   }
 }
-
-#endif

src/fs_base_remove.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_REMOVE_HPP__
+#pragma once
-#define __FS_BASE_REMOVE_HPP__
 
 #include <string>
 
@@ -33,5 +32,3 @@ namespace fs
     return ::remove(pathname.c_str());
   }
 }
-
-#endif

src/fs_base_removexattr.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_REMOVEXATTR_HPP__
+#pragma once
-#define __FS_BASE_REMOVEXATTR_HPP__
 
 #include <sys/types.h>
 
@@ -39,5 +38,3 @@ namespace fs
 #endif
   }
 }
-
-#endif

src/fs_base_rename.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_RENAME_HPP__
+#pragma once
-#define __FS_BASE_RENAME_HPP__
 
 #include <stdio.h>
 
@@ -32,5 +31,3 @@ namespace fs
     return ::rename(oldpath.c_str(),newpath.c_str());
   }
 }
-
-#endif

src/fs_base_rmdir.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_RMDIR_HPP__
+#pragma once
-#define __FS_BASE_RMDIR_HPP__
 
 #include <string>
 
@@ -33,5 +32,3 @@ namespace fs
     return ::rmdir(path.c_str());
   }
 }
-
-#endif

src/fs_base_setxattr.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_SETXATTR_HPP__
+#pragma once
-#define __FS_BASE_SETXATTR_HPP__
 
 #include <sys/types.h>
 
@@ -42,5 +41,3 @@ namespace fs
 #endif
   }
 }
-
-#endif

src/fs_base_stat.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_STAT_HPP__
+#pragma once
-#define __FS_BASE_STAT_HPP__
 
 #include <string>
 
@@ -113,5 +112,3 @@ namespace fs
 #endif
   }
 }
-
-#endif

src/fs_base_statvfs.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_STATVFS_HPP__
+#pragma once
-#define __FS_BASE_STATVFS_HPP__
 
 #include <string>
 
@@ -43,5 +42,3 @@ namespace fs
     return fs::statvfs(path.c_str(),st);
   }
 }
-
-#endif

src/fs_base_symlink.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_SYMLINK_HPP__
+#pragma once
-#define __FS_BASE_SYMLINK_HPP__
 
 #include <string>
 
@@ -43,5 +42,3 @@ namespace fs
     return ::symlink(oldpath,newpath.c_str());
   }
 }
-
-#endif

src/fs_base_truncate.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_TRUNCATE_HPP__
+#pragma once
-#define __FS_BASE_TRUNCATE_HPP__
 
 #include <string>
 
@@ -35,5 +34,3 @@ namespace fs
     return ::truncate(path.c_str(),length);
   }
 }
-
-#endif

src/fs_base_unlink.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_UNLINK_HPP__
+#pragma once
-#define __FS_BASE_UNLINK_HPP__
 
 #include <string>
 
@@ -33,5 +32,3 @@ namespace fs
     return ::unlink(path.c_str());
   }
 }
-
-#endif

src/fs_base_utime.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_UTIME_HPP__
+#pragma once
-#define __FS_BASE_UTIME_HPP__
 
 #ifdef __linux__
 # include "fs_base_utime_utimensat.hpp"
@@ -66,5 +65,3 @@ namespace fs
     return fs::utime(AT_FDCWD,path,times,AT_SYMLINK_NOFOLLOW);
   }
 }
-
-#endif

src/fs_base_utime_generic.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_UTIME_GENERIC_HPP__
+#pragma once
-#define __FS_BASE_UTIME_GENERIC_HPP__
 
 #include <string>
 
@@ -312,5 +311,3 @@ namespace fs
     return ::futimes(fd,tvp);
   }
 }
-
-#endif

src/fs_base_utime_utimensat.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_UTIME_UTIMENSAT_HPP__
+#pragma once
-#define __FS_BASE_UTIME_UTIMENSAT_HPP__
 
 #include <string>
 
@@ -46,5 +45,3 @@ namespace fs
     return ::futimens(fd,times);
   }
 }
-
-#endif

src/fs_base_write.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_BASE_WRITE_HPP__
+#pragma once
-#define __FS_BASE_WRITE_HPP__
 
 #include <unistd.h>
 
@@ -44,5 +43,3 @@ namespace fs
     return ::pwrite(fd,buf,count,offset);
   }
 }
-
-#endif

src/fs_clonefile.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_CLONEFILE_HPP__
+#pragma once
-#define __FS_CLONEFILE_HPP__
 
 #include <string>
 
@@ -26,5 +25,3 @@ namespace fs
   int clonefile(const std::string &from,
                 const std::string &to);
 }
-
-#endif

src/fs_clonepath.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_CLONEPATH_HPP__
+#pragma once
-#define __FS_CLONEPATH_HPP__
 
 #include <string>
 
@@ -28,5 +27,3 @@ namespace fs
                 const std::string &to,
                 const std::string &relative);
 }
-
-#endif

src/fs_devid.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_DEVID_HPP__
+#pragma once
-#define __FS_DEVID_HPP__
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -40,5 +39,3 @@ namespace fs
     return st.st_dev;
   }
 }
-
-#endif

src/fs_inode.hpp

@@ -16,8 +16,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_INODE_HPP__
+#pragma once
-#define __FS_INODE_HPP__
 
 #include <stdint.h>
 #include <sys/stat.h>
@@ -35,7 +34,7 @@ namespace fs
     void
     recompute(struct stat &st)
     {
-      // not ideal to do this at runtime but usually gets optimized out
+      // not ideal to do this at runtime but likely gets optimized out
       if(sizeof(st.st_ino) == 4)
         st.st_ino |= ((uint32_t)st.st_dev << 16);
       else
@@ -43,5 +42,3 @@ namespace fs
     }
   }
 }
-
-#endif

src/fs_movefile.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_MOVEFILE_HPP__
+#pragma once
-#define __FS_MOVEFILE_HPP__
 
 #include <string>
 #include <vector>
@@ -28,5 +27,3 @@ namespace fs
            const size_t                    additional_size,
            int                            &origfd);
 }
-
-#endif

src/fs_path.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_PATH_HPP__
+#pragma once
-#define __FS_PATH_HPP__
 
 #include <string>
 #include <vector>
@@ -67,5 +66,3 @@ namespace fs
     }
   }
 };
-
-#endif // __FS_PATH_HPP__

src/fs_sendfile.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_SENDFILE_HPP__
+#pragma once
-#define __FS_SENDFILE_HPP__
 
 namespace fs
 {
@@ -24,5 +23,3 @@ namespace fs
            const int    fdout,
            const size_t count);
 }
-
-#endif // __FS_SENDFILE_HPP__

src/fs_xattr.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FS_XATTR_HPP__
+#pragma once
-#define __FS_XATTR_HPP__
 
 #include <string>
 #include <vector>
@@ -65,5 +64,3 @@ namespace fs
              const string &to);
   }
 }
-
-#endif // __FS_HPP__

src/fsync.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FSYNC_HPP__
+#pragma once
-#define __FSYNC_HPP__
 
 #include <fuse.h>
 
@@ -29,5 +28,3 @@ namespace mergerfs
           fuse_file_info *fi);
   }
 }
-
-#endif

src/fsyncdir.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FSYNCDIR_HPP__
+#pragma once
-#define __FSYNCDIR_HPP__
 
 #include <fuse.h>
 
@@ -29,5 +28,3 @@ namespace mergerfs
              fuse_file_info *ffi);
   }
 }
-
-#endif

src/ftruncate.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FTRUNCATE_HPP__
+#pragma once
-#define __FTRUNCATE_HPP__
 
 #include <fuse.h>
 
@@ -32,5 +31,3 @@ namespace mergerfs
               fuse_file_info *fi);
   }
 }
-
-#endif

src/fusefunc.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __FUSEFUNC_HPP__
+#pragma once
-#define __FUSEFUNC_HPP__
 
 #include <string>
 #include <vector>
@@ -127,5 +126,3 @@ namespace mergerfs
     static const FuseFunc              &utimens;
   };
 }
-
-#endif

src/getattr.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __GETATTR_HPP__
+#pragma once
-#define __GETATTR_HPP__
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -30,5 +29,3 @@ namespace mergerfs
             struct stat *buf);
   }
 }
-
-#endif

src/getxattr.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __GETXATTR_HPP__
+#pragma once
-#define __GETXATTR_HPP__
 
 namespace mergerfs
 {
@@ -28,5 +27,3 @@ namespace mergerfs
              size_t      count);
   }
 }
-
-#endif

src/gidcache.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __GIDCACHE_HPP__
+#pragma once
-#define __GIDCACHE_HPP__
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -54,5 +53,3 @@ public:
   initgroups(const uid_t uid,
              const gid_t gid);
 };
-
-#endif

src/init.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __INIT_HPP__
+#pragma once
-#define __INIT_HPP__
 
 namespace mergerfs
 {
@@ -25,5 +24,3 @@ namespace mergerfs
     init(fuse_conn_info *conn);
   }
 }
-
-#endif

src/ioctl.hpp

@@ -14,8 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __IOCTL_HPP__
+#pragma once
-#define __IOCTL_HPP__
+
+#include <fuse.h>
 
 namespace mergerfs
 {
@@ -30,5 +31,3 @@ namespace mergerfs
           void           *data);
   }
 }
-
-#endif

src/link.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __LINK_HPP__
+#pragma once
-#define __LINK_HPP__
 
 namespace mergerfs
 {
@@ -26,5 +25,3 @@ namespace mergerfs
          const char *to);
   }
 }
-
-#endif

src/listxattr.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __LISTXATTR_HPP__
+#pragma once
-#define __LISTXATTR_HPP__
 
 namespace mergerfs
 {
@@ -27,5 +26,3 @@ namespace mergerfs
               size_t      count);
   }
 }
-
-#endif

src/mergerfs.hpp

@@ -14,7 +14,4 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __MERGER_HPP__
+#pragma once
-#define __MERGER_HPP__
-
-#endif

src/mkdir.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __MKDIR_HPP__
+#pragma once
-#define __MKDIR_HPP__
 
 namespace mergerfs
 {
@@ -26,5 +25,3 @@ namespace mergerfs
           mode_t      mode);
   }
 }
-
-#endif

src/mknod.hpp

@@ -15,8 +15,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __MKNOD_HPP__
+#pragma once
-#define __MKNOD_HPP__
 
 namespace mergerfs
 {
@@ -28,5 +27,3 @@ namespace mergerfs
           dev_t       rdev);
   }
 }
-
-#endif

src/num.hpp

@@ -14,17 +14,14 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __NUM_HPP__
+#pragma once
-#define __NUM_HPP__
-
-#include <string>
 
 #include <stdint.h>
 
+#include <string>
+
 namespace num
 {
   int to_uint64_t(const std::string &str, uint64_t &value);
   int to_time_t(const std::string &str, time_t &value);
 }
-
-#endif

src/open.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __OPEN_HPP__
+#pragma once
-#define __OPEN_HPP__
 
 #include <fuse.h>
 
@@ -28,5 +27,3 @@ namespace mergerfs
          fuse_file_info *ffi);
   }
 }
-
-#endif

src/opendir.hpp

@@ -14,8 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __OPENDIR_HPP__
+#pragma once
-#define __OPENDIR_HPP__
+
+#include <fuse.h>
 
 #include <vector>
 
@@ -28,5 +29,3 @@ namespace mergerfs
             fuse_file_info *ffi);
   }
 }
-
-#endif

src/option_parser.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __OPTION_PARSER_HPP__
+#pragma once
-#define __OPTION_PARSER_HPP__
 
 #include <fuse.h>
 
@@ -30,5 +29,3 @@ namespace mergerfs
           Config    &config);
   }
 }
-
-#endif

src/policy.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __POLICY_HPP__
+#pragma once
-#define __POLICY_HPP__
 
 #include <string>
 #include <vector>
@@ -190,5 +189,3 @@ namespace mergerfs
     static const Policy &rand;
   };
 }
-
-#endif

src/read.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __READ_HPP__
+#pragma once
-#define __READ_HPP__
 
 namespace mergerfs
 {
@@ -43,5 +42,3 @@ namespace mergerfs
               fuse_file_info *fi);
   }
 }
-
-#endif

src/read_buf.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __READ_BUF_HPP__
+#pragma once
-#define __READ_BUF_HPP__
 
 #include <fuse.h>
 
@@ -33,5 +32,3 @@ namespace mergerfs
              fuse_file_info      *fi);
   }
 }
-
-#endif

src/readdir.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __READDIR_HPP__
+#pragma once
-#define __READDIR_HPP__
 
 #include <string>
 #include <vector>
@@ -38,5 +37,3 @@ namespace mergerfs
             fuse_file_info  *fi);
   }
 }
-
-#endif

src/readlink.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __READLINK_HPP__
+#pragma once
-#define __READLINK_HPP__
 
 namespace mergerfs
 {
@@ -27,5 +26,3 @@ namespace mergerfs
              size_t      size);
   }
 }
-
-#endif

src/release.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __RELEASE_HPP__
+#pragma once
-#define __RELEASE_HPP__
 
 namespace mergerfs
 {
@@ -26,5 +25,3 @@ namespace mergerfs
             fuse_file_info *fi);
   }
 }
-
-#endif

src/releasedir.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __RELEASEDIR_HPP__
+#pragma once
-#define __RELEASEDIR_HPP__
 
 #include <fuse.h>
 
@@ -28,5 +27,3 @@ namespace mergerfs
                fuse_file_info *ffi);
   }
 }
-
-#endif

src/removexattr.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __REMOVEXATTR_HPP__
+#pragma once
-#define __REMOVEXATTR_HPP__
 
 namespace mergerfs
 {
@@ -26,5 +25,3 @@ namespace mergerfs
                 const char *attrname);
   }
 }
-
-#endif

src/rename.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __RENAME_HPP__
+#pragma once
-#define __RENAME_HPP__
 
 namespace mergerfs
 {
@@ -26,5 +25,3 @@ namespace mergerfs
            const char *to);
   }
 }
-
-#endif

src/resources.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __RESOURCES_HPP__
+#pragma once
-#define __RESOURCES_HPP__
 
 namespace mergerfs
 {
@@ -28,5 +27,3 @@ namespace mergerfs
     int setpriority(const int prio);
   }
 }
-
-#endif

src/rmdir.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __RMDIR_HPP__
+#pragma once
-#define __RMDIR_HPP__
 
 namespace mergerfs
 {
@@ -25,5 +24,3 @@ namespace mergerfs
     rmdir(const char *fusepath);
   }
 }
-
-#endif

src/rv.hpp

@@ -14,8 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef __RV_HPP__
+#pragma once
-#define __RV_HPP__
 
 namespace error
 {
@@ -36,5 +35,3 @@ namespace error
     return 0;
   }
 }
-
-#endif // __RV_HPP__