replace header guards with #pragma once

2025-07-29 08:21:15 +03:00 · 2021-12-14 20:06:05 +03:00
parent ab449ebcc0
commit 01f3ceb437
638 changed files with 638 additions and 1914 deletions
--- a/versioning/BRM/autoincrementmanager.h
+++ b/versioning/BRM/autoincrementmanager.h
@ -27,8 +27,7 @@
 #include <map>
 #include "calpontsystemcatalog.h"

-#ifndef AUTOINCREMENTMANAGER_H_
-#define AUTOINCREMENTMANAGER_H_
+#pragma once

 #if defined(_MSC_VER) && defined(xxxBRMAUTOINCMGR_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
@ -78,4 +77,3 @@ private:

 #undef EXPORT

-#endif /* AUTOINCREMENTMANAGER_H_ */
--- a/versioning/BRM/blockresolutionmanager.h
+++ b/versioning/BRM/blockresolutionmanager.h
@ -24,8 +24,7 @@
 * class BlockResolutionManager
 */

-#ifndef BLOCKRESOLUTIONMANAGER_H_
-#define BLOCKRESOLUTIONMANAGER_H_
+#pragma once

 #include <sys/types.h>
 #include <vector>
@ -127,4 +126,3 @@ private:

 #undef EXPORT

-#endif
--- a/versioning/BRM/brmshmimpl.h
+++ b/versioning/BRM/brmshmimpl.h
@ -24,8 +24,7 @@
 * class BRMShmImpl
 */

-#ifndef IDBSHMIMPL_H_
-#define IDBSHMIMPL_H_
+#pragma once

 #include <unistd.h>
 //#define NDEBUG
@ -76,4 +75,3 @@ private:

 } //namespace

-#endif
--- a/versioning/BRM/brmtypes.h
+++ b/versioning/BRM/brmtypes.h
@ -23,8 +23,7 @@
 /** @file
 */

-#ifndef BRMTYPES_H_
-#define BRMTYPES_H_
+#pragma once

 #include <vector>
 #include <sys/types.h>
@ -659,4 +658,3 @@ std::ostream& operator<<(std::ostream&, const QueryContext&);

 #undef EXPORT

-#endif
--- a/versioning/BRM/copylocks.h
+++ b/versioning/BRM/copylocks.h
@ -24,8 +24,7 @@
 * class XXX interface
 */

-#ifndef COPYLOCKS_H_
-#define COPYLOCKS_H_
+#pragma once

 #include <set>
 #include <sys/types.h>
@ -171,4 +170,3 @@ private:

 #undef EXPORT

-#endif
--- a/versioning/BRM/dbrm.h
+++ b/versioning/BRM/dbrm.h
@ -24,8 +24,7 @@
 * class DBRM
 */

-#ifndef DBRM_H_
-#define DBRM_H_
+#pragma once

 #include <unistd.h>
 #include <sys/types.h>
@ -1051,4 +1050,3 @@ private:

 #undef EXPORT

-#endif
--- a/versioning/BRM/extentmap.h
+++ b/versioning/BRM/extentmap.h
@ -24,8 +24,7 @@
 * class ExtentMap
 */

-#ifndef _EXTENTMAP_H_
-#define _EXTENTMAP_H_
+#pragma once

 #include <sys/types.h>
 #include <vector>
@ -1037,4 +1036,3 @@ inline std::ostream& operator<<(std::ostream& os, ExtentMap& rhs)

 #undef EXPORT

-#endif
--- a/versioning/BRM/lbidresourcegraph.h
+++ b/versioning/BRM/lbidresourcegraph.h
@ -24,8 +24,7 @@
 * class XXX interface
 */

-#ifndef LBIDRESOURCEGRAPH_H_
-#define LBIDRESOURCEGRAPH_H_
+#pragma once

 #include <map>
 #include <set>
@ -85,4 +84,3 @@ private:

 #undef EXPORT

-#endif
--- a/versioning/BRM/logicalpartition.h
+++ b/versioning/BRM/logicalpartition.h
@ -25,8 +25,7 @@
 * This struct will be used in connector, brm and writeengine
 */

-#ifndef LOGICALPARTITION_H_
-#define LOGICALPARTITION_H_
+#pragma once

 #include "bytestream.h"

@ -87,4 +86,3 @@ messageqcpp::ByteStream& operator<<(messageqcpp::ByteStream& bs, const LogicalPa
 messageqcpp::ByteStream& operator>>(messageqcpp::ByteStream& bs, LogicalPartition& rhs);

 }
-#endif
--- a/versioning/BRM/masterdbrmnode.h
+++ b/versioning/BRM/masterdbrmnode.h
@ -24,8 +24,7 @@
 * class MasterDBRMNode interface
 */

-#ifndef MASTERDBRMNODE_H_
-#define MASTERDBRMNODE_H_
+#pragma once

 #include <boost/thread.hpp>
 #include <boost/scoped_ptr.hpp>
@ -263,4 +262,3 @@ private:

 }

-#endif
--- a/versioning/BRM/mastersegmenttable.h
+++ b/versioning/BRM/mastersegmenttable.h
@ -31,8 +31,7 @@
 * XXXPAT: We should make a cleanup class here also.
 */

-#ifndef _MASTERSEGMENTTABLE_H_
-#define _MASTERSEGMENTTABLE_H_
+#pragma once

 #include <stdexcept>
 #include <sys/types.h>
@ -213,4 +212,3 @@ private:

 #undef EXPORT

-#endif
--- a/versioning/BRM/oidserver.h
+++ b/versioning/BRM/oidserver.h
@ -24,8 +24,7 @@
 * class OIDServer interface.
 */

-#ifndef OBJECTIDMANAGER_H_
-#define OBJECTIDMANAGER_H_
+#pragma once

 #include <string>
 #include <stdint.h>
@ -212,4 +211,3 @@ private:

 #undef EXPORT

-#endif
--- a/versioning/BRM/resourcenode.h
+++ b/versioning/BRM/resourcenode.h
@ -24,8 +24,7 @@
 * class XXX interface
 */

-#ifndef RESOURCENODE_H_
-#define RESOURCENODE_H_
+#pragma once

 #include "rgnode.h"

@ -87,4 +86,3 @@ struct RNEquals

 #undef EXPORT

-#endif
--- a/versioning/BRM/rgnode.h
+++ b/versioning/BRM/rgnode.h
@ -24,8 +24,7 @@
 * class RGNode interface.  This is a base class for the nodes in the resource graph.
 */

-#ifndef RGNODE_H_
-#define RGNODE_H_
+#pragma once

 #include <set>

@ -74,4 +73,3 @@ private:

 #undef EXPORT

-#endif
--- a/versioning/BRM/rwlockmonitor.h
+++ b/versioning/BRM/rwlockmonitor.h
@ -22,8 +22,7 @@
 *      Author: pleblanc
 */

-#ifndef RWLOCKMONITOR_H_
-#define RWLOCKMONITOR_H_
+#pragma once

 #include <unistd.h>
 #include <boost/scoped_ptr.hpp>
@ -68,5 +67,4 @@ private:

 #undef EXPORT

-#endif /* RWLOCKMONITOR_H_ */

--- a/versioning/BRM/sessionmanagerserver.h
+++ b/versioning/BRM/sessionmanagerserver.h
@ -24,8 +24,7 @@
 * class SessionManagerServer interface
 */

-#ifndef _SESSIONMANAGERSERVER_H
-#define _SESSIONMANAGERSERVER_H
+#pragma once

 #include <map>

@ -293,4 +292,3 @@ private:

 #undef EXPORT

-#endif
--- a/versioning/BRM/shmkeys.h
+++ b/versioning/BRM/shmkeys.h
@ -17,8 +17,7 @@

 // $Id: shmkeys.h 1823 2013-01-21 14:13:09Z rdempsey $
 /** @file */
-#ifndef BRM_SHMEYS_H_
-#define BRM_SHMEYS_H_
+#pragma once

 #include <stdint.h>
 #include <string>
@ -77,5 +76,4 @@ private:

 #undef EXPORT

-#endif

--- a/versioning/BRM/slavecomm.h
+++ b/versioning/BRM/slavecomm.h
@ -24,8 +24,7 @@
 * class XXX interface
 */

-#ifndef SLAVECOMM_H_
-#define SLAVECOMM_H_
+#pragma once

 #include <unistd.h>
 #include <iostream>
@ -142,4 +141,3 @@ private:

 #undef EXPORT

-#endif
--- a/versioning/BRM/slavedbrmnode.h
+++ b/versioning/BRM/slavedbrmnode.h
@ -24,8 +24,7 @@
 * class SlaveDBRMNode
 */

-#ifndef SLAVEDBRMNODE_H_
-#define SLAVEDBRMNODE_H_
+#pragma once

 #include <sys/types.h>
 #include <vector>
@ -519,4 +518,3 @@ private:

 #undef EXPORT

-#endif
--- a/versioning/BRM/tablelockserver.h
+++ b/versioning/BRM/tablelockserver.h
@ -25,8 +25,7 @@
 #include "brmtypes.h"
 #include "sessionmanagerserver.h"

-#ifndef TABLELOCKSERVER_H_
-#define TABLELOCKSERVER_H_
+#pragma once

 #if defined(_MSC_VER) && defined(xxxBRMTBLLOCKSVR_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
@ -68,4 +67,3 @@ private:

 #undef EXPORT

-#endif /* TABLELOCKSERVER_H_ */
--- a/versioning/BRM/tracer.h
+++ b/versioning/BRM/tracer.h
@ -24,8 +24,7 @@
 * class DBRM
 */

-#ifndef TRACER_H_
-#define TRACER_H_
+#pragma once

 #include <sys/types.h>
 #include <string>
@ -190,5 +189,4 @@ private:

 #undef EXPORT

-#endif

--- a/versioning/BRM/transactionnode.h
+++ b/versioning/BRM/transactionnode.h
@ -24,8 +24,7 @@
 * class XXX interface
 */

-#ifndef TRANSACTIONNODE_H_
-#define TRANSACTIONNODE_H_
+#pragma once

 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
@ -70,4 +69,3 @@ private:

 } // namespace

-#endif		// TRANSACTIONNODE_H_
--- a/versioning/BRM/undoable.h
+++ b/versioning/BRM/undoable.h
@ -25,8 +25,7 @@
 * to support revoking any changes made on error.
 */

-#ifndef _UNDOABLE_H_
-#define _UNDOABLE_H_
+#pragma once

 #include <vector>

@ -59,4 +58,3 @@ protected:

 }

-#endif
--- a/versioning/BRM/vbbm.h
+++ b/versioning/BRM/vbbm.h
@ -24,8 +24,7 @@
 * class XXX interface
 */

-#ifndef _VBBM_H_
-#define _VBBM_H_
+#pragma once

 #include <vector>
 //#define NDEBUG
@ -260,5 +259,4 @@ private:

 #undef EXPORT

-#endif // _VBBM_H_

--- a/versioning/BRM/vss.h
+++ b/versioning/BRM/vss.h
@ -24,8 +24,7 @@
 * class XXX interface
 */

-#ifndef _VSS_H_
-#define _VSS_H_
+#pragma once

 #include <set>
 //#define NDEBUG
@ -298,5 +297,4 @@ private:

 #undef EXPORT

-#endif // _VSS_H_