Switch from header guards to pragma once

src/file_analysis/Analyzer.h

@@ -1,7 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef FILE_ANALYSIS_ANALYZER_H
-#define FILE_ANALYSIS_ANALYZER_H
+#pragma once
 
 #include "Val.h"
 #include "NetVar.h"
@@ -189,5 +188,3 @@ private:
 };
 
 } // namespace file_analysis
-
-#endif

src/file_analysis/AnalyzerSet.h

@@ -1,7 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef FILE_ANALYSIS_ANALYZERSET_H
-#define FILE_ANALYSIS_ANALYZERSET_H
+#pragma once
 
 #include <queue>
 
@@ -207,5 +206,3 @@ private:
 };
 
 } // namespace file_analysiss
-
-#endif

src/file_analysis/Component.h

@@ -1,7 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef FILE_ANALYZER_COMPONENT_H
-#define FILE_ANALYZER_COMPONENT_H
+#pragma once
 
 #include "Tag.h"
 #include "plugin/Component.h"
@@ -77,5 +76,3 @@ private:
 };
 
 }
-
-#endif

src/file_analysis/File.h

@@ -1,7 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef FILE_ANALYSIS_FILE_H
-#define FILE_ANALYSIS_FILE_H
+#pragma once
 
 #include <string>
 #include <utility>
@@ -363,5 +362,3 @@ protected:
 };
 
 } // namespace file_analysis
-
-#endif

src/file_analysis/FileReassembler.h

@@ -1,5 +1,4 @@
-#ifndef FILE_ANALYSIS_FILEREASSEMBLER_H
-#define FILE_ANALYSIS_FILEREASSEMBLER_H
+#pragma once
 
 #include "Reassem.h"
 #include "File.h"
@@ -59,5 +58,3 @@ protected:
 };
 
 } // namespace analyzer::* 
-
-#endif

src/file_analysis/FileTimer.h

@@ -1,7 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef FILE_ANALYSIS_FILETIMER_H
-#define FILE_ANALYSIS_FILETIMER_H
+#pragma once
 
 #include <string>
 #include "Timer.h"
@@ -35,5 +34,3 @@ private:
 };
 
 } // namespace file_analysis
-
-#endif

src/file_analysis/Manager.h

@@ -1,7 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef FILE_ANALYSIS_MANAGER_H
-#define FILE_ANALYSIS_MANAGER_H
+#pragma once
 
 #include <string>
 #include <set>
@@ -428,5 +427,3 @@ VectorVal* GenMIMEMatchesVal(const RuleMatcher::MIME_Matches& m);
 } // namespace file_analysis
 
 extern file_analysis::Manager* file_mgr;
-
-#endif

src/file_analysis/Tag.h

@@ -1,7 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef FILE_ANALYZER_TAG_H
-#define FILE_ANALYZER_TAG_H
+#pragma once
 
 #include "zeek-config.h"
 #include "util.h"
@@ -108,5 +107,3 @@ protected:
 };
 
 }
-
-#endif

src/file_analysis/analyzer/data_event/DataEvent.h

@@ -1,7 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef FILE_ANALYSIS_DATAEVENT_H
-#define FILE_ANALYSIS_DATAEVENT_H
+#pragma once
 
 #include <string>
 
@@ -65,5 +64,3 @@ private:
 };
 
 } // namespace file_analysis
-
-#endif

src/file_analysis/analyzer/entropy/Entropy.h

@@ -1,7 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef FILE_ANALYSIS_ENTROPY_H
-#define FILE_ANALYSIS_ENTROPY_H
+#pragma once
 
 #include <string>
 
@@ -80,5 +79,3 @@ private:
 };
 
 } // namespace file_analysis
-
-#endif

src/file_analysis/analyzer/extract/Extract.h

@@ -1,7 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef FILE_ANALYSIS_EXTRACT_H
-#define FILE_ANALYSIS_EXTRACT_H
+#pragma once
 
 #include <string>
 
@@ -78,5 +77,3 @@ private:
 };
 
 } // namespace file_analysis
-
-#endif

src/file_analysis/analyzer/hash/Hash.h

@@ -1,7 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef FILE_ANALYSIS_HASH_H
-#define FILE_ANALYSIS_HASH_H
+#pragma once
 
 #include <string>
 
@@ -156,5 +155,3 @@ protected:
 };
 
 } // namespace file_analysis
-
-#endif

src/file_analysis/analyzer/pe/PE.h

@@ -1,5 +1,4 @@
-#ifndef FILE_ANALYSIS_PE_H
-#define FILE_ANALYSIS_PE_H
+#pragma once
 
 #include <string>
 
@@ -31,5 +30,3 @@ protected:
 };
 
 } // namespace file_analysis
-
-#endif

src/file_analysis/analyzer/unified2/Unified2.h

@@ -1,7 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef FILE_ANALYSIS_UNIFIED2_H
-#define FILE_ANALYSIS_UNIFIED2_H
+#pragma once
 
 #include <string>
 
@@ -33,5 +32,3 @@ private:
 };
 
 } // namespace file_analysis
-
-#endif

src/file_analysis/analyzer/x509/OCSP.h

@@ -1,7 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef FILE_ANALYSIS_OCSP_H
-#define FILE_ANALYSIS_OCSP_H
+#pragma once
 
 #include <string>
 
@@ -35,5 +34,3 @@ private:
 };
 
 }
-
-#endif

src/file_analysis/analyzer/x509/X509.h

@@ -1,7 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef FILE_ANALYSIS_X509_H
-#define FILE_ANALYSIS_X509_H
+#pragma once
 
 #include <string>
 
@@ -157,5 +156,3 @@ private:
 };
 
 }
-
-#endif

src/file_analysis/analyzer/x509/X509Common.h

@@ -3,8 +3,7 @@
 // Common base class for the X509 and OCSP analyzer, which share a fair amount of
 // code
 
-#ifndef FILE_ANALYSIS_X509_COMMON
-#define FILE_ANALYSIS_X509_COMMON
+#pragma once
 
 #include "file_analysis/File.h"
 #include "Analyzer.h"
@@ -42,5 +41,3 @@ protected:
 };
 
 }
-
-#endif /* FILE_ANALYSIS_X509_COMMON */