replace header guards with #pragma once

tools/cleartablelock/cleartablelockthread.h

@@ -19,8 +19,7 @@
 * $Id: cleartablelockthread.h 2101 2013-01-21 14:12:52Z rdempsey $
 *
 *******************************************************************************/
-#ifndef ClearTableLockThread_H__
-#define ClearTableLockThread_H__
+#pragma once
 
 #include <string>
 
@@ -134,4 +133,3 @@ private:
     static boost::mutex   fStdOutLock;    // Synchronize logging to stdout
 };
 
-#endif

tools/dbbuilder/dbbuilder.h

@@ -22,8 +22,7 @@
 /**
  * @file
  */
-#ifndef DBBUILDER_H
-#define DBBUILDER_H
+#pragma once
 
 #include <string>
 #include <sstream>
@@ -58,4 +57,3 @@
 #include "messagelog.h"
 #include "liboamcpp.h"
 
-#endif //DBBUILDER_H

tools/dbbuilder/systemcatalog.h

@@ -20,8 +20,7 @@
 /**
  * @file
  */
-#ifndef SYSTEMCATALOG_H
-#define SYSTEMCATALOG_H
+#pragma once
 
 #include "writeengine.h"
 
@@ -38,4 +37,3 @@ private:
 
 
 
-#endif //SYSTEMCATLOG_H

tools/dbbuilder/tpchpopulate.h

@@ -22,8 +22,7 @@
 /**
  * @file
  */
-#ifndef TPCHPOPULATE_H
-#define TPCHPOPULATE_H
+#pragma once
 
 class TpchPopulate
 {
@@ -41,4 +40,3 @@ private:
 
 };
 
-#endif //TPCHPOPULATE_H

tools/dbbuilder/tpchschema.h

@@ -22,8 +22,7 @@
 /**
  * @file
  */
-#ifndef TPCHSCHEMA_H
-#define TPCHSCHEMA_H
+#pragma once
 
 class TpchSchema
 {
@@ -42,4 +41,3 @@ private:
     void createindex(std::string createText);
 };
 
-#endif //TPCHSCHEMA_H

tools/dbloadxml/inputmgr.h

@@ -20,8 +20,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef INPUTMGR_H
-#define INPUTMGR_H
+#pragma once
 
 #include <string>
 #include "we_xmlgendata.h"
@@ -67,4 +66,3 @@ private:
 
 }
 
-#endif

tools/dmldriver/dmlif.h

@@ -17,8 +17,7 @@
 
 // $Id: dmlif.h 2101 2013-01-21 14:12:52Z rdempsey $
 
-#ifndef DMLIF_H__
-#define DMLIF_H__
+#pragma once
 
 #include <string>
 #include <cstddef>
@@ -66,5 +65,4 @@ private:
 
 }
 
-#endif
 

tools/dmldriver/tpchrf2.h

@@ -17,8 +17,7 @@
 
 // $Id: tpchrf2.h 2101 2013-01-21 14:12:52Z rdempsey $
 
-#ifndef TPCHRF2_H__
-#define TPCHRF2_H__
+#pragma once
 
 #include <string>
 #include <istream>
@@ -53,4 +52,3 @@ private:
 
 }
 
-#endif

tools/qfe/bison-win.h

@@ -34,8 +34,7 @@
 
 
 /* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
+#pragma once
 /* Put the tokens into the symbol table, so that GDB and other debuggers
    know about them.  */
 enum yytokentype
@@ -79,7 +78,6 @@ typedef union YYSTYPE
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-#endif
 
 extern YYSTYPE qfelval;
 

tools/qfe/cseputils.h

@@ -1,5 +1,4 @@
-#ifndef QFE_CSEPUTILS_H__
-#define QFE_CSEPUTILS_H__
+#pragma once
 
 #include <string>
 
@@ -42,5 +41,4 @@ void updateParseTree(boost::shared_ptr<execplan::CalpontSystemCatalog>&,
 
 } //namespace qfe::utils
 } //namespace qfe
-#endif
 

tools/qfe/ddlstmts.h

@@ -1,5 +1,4 @@
-#ifndef QFE_DDLSTMTS_H__
-#define QFE_DDLSTMTS_H__
+#pragma once
 
 #include <unistd.h>
 #include <string>
@@ -10,5 +9,4 @@ void processCreateStmt(const std::string&, uint32_t);
 void processDropStmt(const std::string&, uint32_t);
 }
 
-#endif
 

tools/qfe/parsequery.h

@@ -1,5 +1,4 @@
-#ifndef QFE_PARSEQUERY_H__
-#define QFE_PARSEQUERY_H__
+#pragma once
 
 #include <unistd.h>
 #include <string>
@@ -13,4 +12,3 @@ execplan::CalpontSelectExecutionPlan* parseQuery(const std::string&, uint32_t);
 
 }
 
-#endif

tools/qfe/returnedrows.h

@@ -1,5 +1,4 @@
-#ifndef QFE_RETURNEDROWS_H__
-#define QFE_RETURNEDROWS_H__
+#pragma once
 
 #include "socktype.h"
 #include "messagequeue.h"
@@ -11,5 +10,4 @@ void processReturnedRows(messageqcpp::MessageQueueClient*, SockType);
 
 }
 
-#endif
 

tools/qfe/sendcsep.h

@@ -1,5 +1,4 @@
-#ifndef QFE_SENDCSEP_H__
-#define QFE_SENDCSEP_H__
+#pragma once
 
 #include "messagequeue.h"
 #include "calpontselectexecutionplan.h"
@@ -13,5 +12,4 @@ messageqcpp::MessageQueueClient* sendCSEP(execplan::CalpontSelectExecutionPlan*)
 
 }
 
-#endif
 

tools/qfe/socketio.h

@@ -1,5 +1,4 @@
-#ifndef QFE_SOCKETIO_H__
-#define QFE_SOCKETIO_H__
+#pragma once
 
 #ifdef _MSC_VER
 #define WIN32_LEAN_AND_MEAN
@@ -32,5 +31,4 @@ void writeString(SockType, const std::string&);
 } //namespace qfe::socketio
 } //namespace qfe
 
-#endif
 

tools/qfe/socktype.h

@@ -1,5 +1,4 @@
-#ifndef QFE_SOCKTYPE_H__
-#define QFE_SOCKTYPE_H__
+#pragma once
 
 #ifdef _MSC_VER
 #define WIN32_LEAN_AND_MEAN
@@ -17,5 +16,4 @@ typedef int SockType;
 #define SockWriteFcn qfe::socketio::writen
 #endif
 
-#endif
 

tools/rebuildEM/BRM_saves_em_system_tables_blob.h

@@ -1,5 +1,4 @@
-#ifndef BRM_SAVES_EM_SYSTEM_TABLES_BLOB
-#define BRM_SAVES_EM_SYSTEM_TABLES_BLOB
+#pragma once
 
 // Generated by hexdump -C BRM_saves_em for initial system catalog.
 // TODO: This could be compressed by simple `run-length encoding`
@@ -337,4 +336,3 @@ static const uint8_t BRM_saves_em_system_tables_blob[] = {
     0x00, 0x94, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0xff, 0xff, 0x03,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-#endif

tools/rebuildEM/rebuildEM.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef REBUILD_EM_H
-#define REBUILD_EM_H
+#pragma once
 
 #include <string>
 #include <map>
@@ -228,4 +227,3 @@ class ChunkManagerWrapperDict : public ChunkManagerWrapper
 };
 
 } // namespace RebuildExtentMap
-#endif