replace header guards with #pragma once

datatypes/mcs_data_condition.h

@@ -16,8 +16,7 @@
    MA 02110-1301, USA. */
 
 
-#ifndef MCS_DATA_CONDITION_H
+#pragma once
-#define MCS_DATA_CONDITION_H
 
 namespace datatypes
 {
@@ -80,4 +79,3 @@ private:
 
 } // namespace datatypes
 
-#endif // MCS_DATA_CONDITION_H

datatypes/mcs_datatype.h

@@ -15,8 +15,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
-#ifndef MCS_DATATYPE_H_INCLUDED
+#pragma once
-#define MCS_DATATYPE_H_INCLUDED
 
 #include <sstream>
 #include <boost/any.hpp>
@@ -2883,6 +2882,5 @@ class TypeHandlerTimestamp: public TypeHandlerTemporal
 
 }// end of namespace datatypes
 
-#endif //MCS_DATATYPE_H_INCLUDED
 
 // vim:ts=2 sw=2:

datatypes/mcs_datatype_basic.h

@@ -16,8 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
 */
-#ifndef MCS_DATATYPE_BASIC_H_INCLUDED
+#pragma once
-#define MCS_DATATYPE_BASIC_H_INCLUDED
 
 /*
   This file contains simple definitions that can be
@@ -91,5 +90,4 @@ uint64_t xFloatToMCSUInt64Round(SRC value)
 
 } //end of namespace datatypes
 
-#endif // MCS_DATATYPE_BASIC_H_INCLUDED
 // vim:ts=2 sw=2:

datatypes/mcs_decimal.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef H_DECIMALDATATYPE
+#pragma once
-#define H_DECIMALDATATYPE
 
 #include <cstdint>
 #include <cfloat>
@@ -983,4 +982,3 @@ struct NoOverflowCheck {
 };
 
 } //end of namespace
-#endif

datatypes/mcs_double.h

@@ -16,8 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
 */
-#ifndef MCS_DOUBLE_H_INCLUDED
+#pragma once
-#define MCS_DOUBLE_H_INCLUDED
 
 #include "mcs_datatype_basic.h"
 
@@ -52,5 +51,4 @@ public:
 
 } //end of namespace datatypes
 
-#endif // MCS_DOUBLE_H_INCLUDED
 // vim:ts=2 sw=2:

datatypes/mcs_float128.h

@@ -16,8 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
 */
-#ifndef MCS_TSFLOAT128_H_INCLUDED
+#pragma once
-#define MCS_TSFLOAT128_H_INCLUDED
 
 #include <cfloat>
 #include <cctype>
@@ -631,6 +630,5 @@ class TFloat128
 
 } //end of namespace
 
-#endif // MCS_TSFLOAT128_H_INCLUDED
 // vim:ts=2 sw=2:
 

datatypes/mcs_int128.h

@@ -16,8 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
 */
-#ifndef MCS_INT128_H_INCLUDED
+#pragma once
-#define MCS_INT128_H_INCLUDED
 
 #include <cfloat>
 #include <cstdint>
@@ -345,5 +344,4 @@ class TSInt128
 
 } //end of namespace datatypes
 
-#endif // MCS_TSINT128_H_INCLUDED
 // vim:ts=2 sw=2:

datatypes/mcs_int64.h

@@ -16,8 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. 
 */ 
-#ifndef MCS_INT64_H_INCLUDED
+#pragma once
-#define MCS_INT64_H_INCLUDED
 
 #include "exceptclasses.h"
 
@@ -173,5 +172,4 @@ public:
 
 } //end of namespace datatypes
 
-#endif // MCS_INT64_H_INCLUDED
 // vim:ts=2 sw=2:

datatypes/mcs_longdouble.h

@@ -16,8 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
 */
-#ifndef MCS_LONGDOUBLE_H_INCLUDED
+#pragma once
-#define MCS_LONGDOUBLE_H_INCLUDED
 
 #include "mcs_datatype_basic.h"
 
@@ -52,5 +51,4 @@ public:
 
 } //end of namespace datatypes
 
-#endif // MCS_LONGDOUBLE_H_INCLUDED
 // vim:ts=2 sw=2:

datatypes/mcs_numeric_limits.h

@@ -15,8 +15,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
-#ifndef MCS_NUMERIC_LIMITS_H_INCLUDED
+#pragma once
-#define MCS_NUMERIC_LIMITS_H_INCLUDED
 
 #include <limits>
 
@@ -59,4 +58,3 @@ template<> struct numeric_limits<uint128_t>
 
 } // namespace datatypes
 
-#endif // MCS_NUMERIC_LIMITS_H_INCLUDED

datatypes/mcs_string.h

@@ -16,8 +16,7 @@
    MA 02110-1301, USA. */
 
 
-#ifndef MCS_DATATYPES_STRING_H
+#pragma once
-#define MCS_DATATYPES_STRING_H
 
 #include "conststring.h"
 #include "collation.h"    // class Charset
@@ -50,4 +49,3 @@ public:
 } // namespace datatypes
 
 
-#endif // MCS_DATATYPES_STRING_H

datatypes/numericliteral.h

@@ -16,8 +16,7 @@
    MA 02110-1301, USA. */
 
 
-#ifndef NUMERICLITERAL_H
+#pragma once
-#define NUMERICLITERAL_H
 
 #include "genericparser.h"
 #include "mcs_datatype.h"
@@ -617,4 +616,3 @@ public:
 
 } // namespace literal
 
-#endif // NUMERICLITERAL_H

dbcon/ddlpackage/ddl-gram-win.h

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

dbcon/ddlpackage/ddlpkg.h

@@ -35,8 +35,7 @@
  *
  */
 
-#ifndef DDLPACKAGE_H
+#pragma once
-#define DDLPACKAGE_H
 
 #include <vector>
 #include <string>
@@ -1651,4 +1650,3 @@ struct DropPartitionStatement : public SqlStatement
 
 #undef EXPORT
 
-#endif

dbcon/ddlpackageproc/altertableprocessor.h

@@ -21,8 +21,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef ALTERTABLEPROCESSOR_H
+#pragma once
-#define ALTERTABLEPROCESSOR_H
 
 #include "ddlpackageprocessor.h"
 
@@ -159,4 +158,3 @@ private:
 
 #undef EXPORT
 
-#endif                                            //ALTERTABLEPROCESSOR_H

dbcon/ddlpackageproc/createindexprocessor.h

@@ -21,8 +21,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef CREATEINDEXPROCESSOR_H
+#pragma once
-#define CREATEINDEXPROCESSOR_H
 
 #include "ddlpackageprocessor.h"
 #include "ddlpkg.h"
@@ -51,4 +50,3 @@ private:
 };
 
 }                                                 //namespace ddlpackageprocessor
-#endif                                            //CREATEINDEXPROCESSOR_H

dbcon/ddlpackageproc/createtableprocessor.h

@@ -21,8 +21,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef CREATETABLEPROCESSOR_H
+#pragma once
-#define CREATETABLEPROCESSOR_H
 
 #include "ddlpackageprocessor.h"
 
@@ -61,4 +60,3 @@ private:
 
 #undef EXPORT
 
-#endif                                            // CREATETABLEPROCESSOR_H

dbcon/ddlpackageproc/ddlpackageprocessor.h

@@ -23,8 +23,7 @@
  ***********************************************************************/
 /** @file */
 
-#ifndef DDLPACKAGEPROCESSOR_H
+#pragma once
-#define DDLPACKAGEPROCESSOR_H
 #include <unistd.h>
 #include <string>
 #include <stdexcept>
@@ -879,6 +878,5 @@ bool from_string(T& t,
 
 #undef EXPORT
 
-#endif //DDLPACKAGEPROCESSOR_H
 // vim:ts=4 sw=4:
 

dbcon/ddlpackageproc/ddlpackageprocessorfactory.h

@@ -21,8 +21,7 @@
 *
 ***********************************************************************/
 /** @file */
-#ifndef DDLPACKAGEPROCESSORFACTORY_H
+#pragma once
-#define DDLPACKAGEPROCESSORFACTORY_H
 #include <string>
 #include "ddlpkg.h"
 #include "ddlpackageprocessor.h"
@@ -53,5 +52,4 @@ private:
 };
 
 }
-#endif //DDLPACKAGEPROCESSORFACTORY_H
 

dbcon/ddlpackageproc/dropindexprocessor.h

@@ -21,8 +21,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef DROPINDEXPROCESSOR_H
+#pragma once
-#define DROPINDEXPROCESSOR_H
 
 #include "ddlpackageprocessor.h"
 
@@ -48,4 +47,3 @@ private:
 };
 
 }                                                 //namespace ddlpackageprocessor
-#endif                                            //DROPINDEXPROCESSOR_H

dbcon/ddlpackageproc/droppartitionprocessor.h

@@ -21,8 +21,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef DROPPARTITIONEPROCESSOR_H
+#pragma once
-#define DROPPARTITIONEPROCESSOR_H
 
 #include "ddlpackageprocessor.h"
 
@@ -57,4 +56,3 @@ private:
 
 #undef EXPORT
 
-#endif                                            //DROPPARTITIONEPROCESSOR_H

dbcon/ddlpackageproc/droptableprocessor.h

@@ -21,8 +21,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef DROPTABLEPROCESSOR_H
+#pragma once
-#define DROPTABLEPROCESSOR_H
 
 #include "ddlpackageprocessor.h"
 
@@ -78,4 +77,3 @@ private:
 
 #undef EXPORT
 
-#endif                                            //DROPTABLEPROCESSOR_H

dbcon/ddlpackageproc/markpartitionprocessor.h

@@ -21,8 +21,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef MARKPARTITIONPROCESSOR_H
+#pragma once
-#define MARKPARTITIONPROCESSOR_H
 
 #include "ddlpackageprocessor.h"
 
@@ -60,4 +59,3 @@ private:
 
 #undef EXPORT
 
-#endif                                            // MARKPARTITIONPROCESSOR_H

dbcon/ddlpackageproc/restorepartitionprocessor.h

@@ -21,8 +21,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef RESTOREPARTITIONEPROCESSOR_H
+#pragma once
-#define RESTOREPARTITIONEPROCESSOR_H
 
 #include "ddlpackageprocessor.h"
 
@@ -57,4 +56,3 @@ private:
 
 #undef EXPORT
 
-#endif                                            //RESTOREPARTITIONEPROCESSOR_H

dbcon/dmlpackage/calpontdmlfactory.h

@@ -21,8 +21,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef CALPONTDMLFACTORY_H
+#pragma once
-#define CALPONTDMLFACTORY_H
 #include <string>
 #include "dmlpackage.h"
 #include "calpontdmlpackage.h"
@@ -72,4 +71,3 @@ private:
 
 #undef EXPORT
 
-#endif                                            //CALPONTDMLFACTORY_H

dbcon/dmlpackage/calpontdmlpackage.h

@@ -22,8 +22,7 @@
  ***********************************************************************/
 /** @file */
 
-#ifndef CALPONTDMLPACKAGE_H
+#pragma once
-#define CALPONTDMLPACKAGE_H
 #include <string>
 #include <boost/uuid/uuid.hpp>
 
@@ -394,4 +393,3 @@ protected:
     WriteEngine::ChunkManager* fCM;
 };
 }
-#endif                                            //CALPONTDMLPACKAGE_H

dbcon/dmlpackage/commanddmlpackage.h

@@ -22,8 +22,7 @@
  ***********************************************************************/
 /** @file */
 
-#ifndef COMMANDDMLPACKAGE_H
+#pragma once
-#define COMMANDDMLPACKAGE_H
 #include <string>
 #include "calpontdmlpackage.h"
 #include "bytestream.h"
@@ -101,4 +100,3 @@ private:
 
 #undef EXPORT
 
-#endif                                            //COMMANDDMLPACKAGE_H

dbcon/dmlpackage/deletedmlpackage.h

@@ -22,8 +22,7 @@
  ***********************************************************************/
 /** @file */
 
-#ifndef DELETEDMLPACKAGE_H
+#pragma once
-#define DELETEDMLPACKAGE_H
 #include <string>
 #include "calpontdmlpackage.h"
 #include "bytestream.h"
@@ -103,4 +102,3 @@ private:
 
 #undef EXPORT
 
-#endif                                            //DELETEDMLPACKAGE_H

dbcon/dmlpackage/dml-gram-win.h

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

dbcon/dmlpackage/dmlcolumn.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef DMLCOLUMN_H
+#pragma once
-#define DMLCOLUMN_H
 #include <string>
 #include <vector>
 #include "dmlobject.h"
@@ -167,5 +166,4 @@ typedef std::vector<DMLColumn*>ColumnList;
 
 #undef EXPORT
 
-#endif //DMLCOLUMN_H
 

dbcon/dmlpackage/dmlobject.h

@@ -23,8 +23,7 @@
 /** @file */
 
 
-#ifndef DMLOBJECT_H
+#pragma once
-#define DMLOBJECT_H
 #include <string>
 #include"bytestream.h"
 
@@ -67,6 +66,5 @@ private:
 };
 
 }
-#endif //DMLOBJECT_H
 
 

dbcon/dmlpackage/dmlpackage.h

@@ -21,8 +21,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef DMLPACKAGE_H
+#pragma once
-#define DMLPACKAGE_H
 
 #include "dmlpkg.h"
 
@@ -35,4 +34,3 @@ const std::string nullValue = "nvl";
 //const size_t maxThreads = 100;
 //const size_t queueSize = 200;
 }                                                 // namespace dmlpackage
-#endif                                            //DMLPACKAGE_H

dbcon/dmlpackage/dmlparser.h

@@ -23,8 +23,7 @@
  ***********************************************************************/
 /** @file */
 
-#ifndef DMLPARSER_H
+#pragma once
-#define DMLPARSER_H
 
 #include <stdexcept>
 #include "dmlpkg.h"
@@ -117,4 +116,3 @@ private:
 };
 
 }
-#endif                                            // DMLPARSER_H

dbcon/dmlpackage/dmlpkg.h

@@ -21,8 +21,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef DMLPKG_H
+#pragma once
-#define DMLPKG_H
 
 #include <vector>
 #include <string>
@@ -1048,4 +1047,3 @@ public:
 };
 
 }                                                 // namespace dmlpackage
-#endif                                            // DMLPKG_H

dbcon/dmlpackage/dmltable.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef DMLTABLE_H
+#pragma once
-#define DMLTABLE_H
 
 #include <string>
 #include <vector>
@@ -125,5 +124,4 @@ private:
 
 }  // namespace dmlpackage
 
-#endif //DMLTABLE_H
 

dbcon/dmlpackage/insertdmlpackage.h

@@ -22,8 +22,7 @@
  ***********************************************************************/
 /** @file */
 
-#ifndef INSERTDMLPACKAGE_H
+#pragma once
-#define INSERTDMLPACKAGE_H
 #include <string>
 #include "calpontdmlpackage.h"
 #include "bytestream.h"
@@ -122,4 +121,3 @@ private:
 
 #undef EXPORT
 
-#endif                                            //INSERTDMLPACKAGE_H

dbcon/dmlpackage/mysqldmlstatement.h

@@ -21,8 +21,7 @@
 *
 ***********************************************************************/
 /** @file */
-#ifndef MYSQLDMLSTATEMENT_H
+#pragma once
-#define MYSQLDMLSTATEMENT_H
 #include <string>
 #include "vendordmlstatement.h"
 
@@ -43,5 +42,4 @@ private:
 
 };
 }
-#endif //MYSQLDMLSTATEMENT_H
 

dbcon/dmlpackage/oracledmlstatement.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef ORACLEDMLSTATEMENT_H
+#pragma once
-#define ORACLEDMLSTATEMENT_H
 #include <string>
 #include "vendordmlstatement.h"
 
@@ -44,5 +43,4 @@ private:
 
 };
 }
-#endif //ORACLEDMLSTATEMENT_H
 

dbcon/dmlpackage/row.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef ROW_H
+#pragma once
-#define ROW_H
 #include <string>
 #include "dmlobject.h"
 #include "bytestream.h"
@@ -119,5 +118,4 @@ typedef std::vector<Row*>RowList;
 
 #undef EXPORT
 
-#endif //ROW_H
 

dbcon/dmlpackage/updatedmlpackage.h

@@ -22,8 +22,7 @@
  ***********************************************************************/
 /** @file */
 
-#ifndef UPDATEDMLPACKAGE_H
+#pragma once
-#define UPDATEDMLPACKAGE_H
 #include <string>
 #include "calpontdmlpackage.h"
 #include "bytestream.h"
@@ -105,4 +104,3 @@ private:
 
 #undef EXPORT
 
-#endif                                            //UPDATEDMLPACKAGE_H

dbcon/dmlpackage/vendordmlstatement.h

@@ -21,8 +21,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef VENDORDMLSTATEMENT_H
+#pragma once
-#define VENDORDMLSTATEMENT_H
 #include <string>
 #include <vector>
 #include <map>
@@ -250,4 +249,3 @@ private:
 
 #undef EXPORT
 
-#endif                                            //VENDORDMLSTATEMENT_H

dbcon/dmlpackageproc/autoincrementdata.h

@@ -19,8 +19,7 @@
 
 /** @file */
 
-#ifndef AUTOINCREMENTDATA_H__
+#pragma once
-#define AUTOINCREMENTDATA_H__
 
 #include <stdint.h>
 
@@ -51,5 +50,4 @@ private:
     boost::mutex fOIDnextvalLock;
 };
 
-#endif
 // vim:ts=4 sw=4:

dbcon/dmlpackageproc/commandpackageprocessor.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef COMMANDPACKAGEPROCESSOR_H
+#pragma once
-#define COMMANDPACKAGEPROCESSOR_H
 #include <string>
 #include <vector>
 #include <set>
@@ -77,5 +76,4 @@ private:
 
 #undef EXPORT
 
-#endif //COMMANDPACKAGEPROCESSOR_H
 

dbcon/dmlpackageproc/deletepackageprocessor.h

@@ -22,8 +22,7 @@
  ***********************************************************************/
 /** @file */
 
-#ifndef DELETEPACKAGEPROCESSOR_H
+#pragma once
-#define DELETEPACKAGEPROCESSOR_H
 #include <string>
 #include <iostream>
 #include <vector>
@@ -90,4 +89,3 @@ private:
 
 #undef EXPORT
 
-#endif  // DELETEPACKAGEPROCESSOR_H

dbcon/dmlpackageproc/dmlpackageprocessor.h

@@ -22,8 +22,7 @@
  ***********************************************************************/
 /** @file */
 
-#ifndef DMLPACKAGEPROCESSOR_H
+#pragma once
-#define DMLPACKAGEPROCESSOR_H
 #include <stdexcept>
 #include <string>
 #include <sstream>
@@ -551,4 +550,3 @@ bool from_string(T& t,
 
 #undef EXPORT
 
-#endif                                            //DMLPACKAGEPROCESSOR_H

dbcon/dmlpackageproc/dmlpackageprocessorfactory.h

@@ -21,8 +21,7 @@
 *
 ***********************************************************************/
 /** @file */
-#ifndef DMLPACKAGEPROCESSORFACTORY_H
+#pragma once
-#define DMLPACKAGEPROCESSORFACTORY_H
 #include <string>
 #include "calpontdmlpackage.h"
 #include "dmlpackageprocessor.h"
@@ -62,5 +61,4 @@ private:
 
 #undef EXPORT
 
-#endif //DMLPACKAGEPROCESSORFACTORY_H
 

dbcon/dmlpackageproc/insertpackageprocessor.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef INSERTPACKAGEPROCESSOR_H
+#pragma once
-#define INSERTPACKAGEPROCESSOR_H
 #include <string>
 #include <vector>
 #include <boost/any.hpp>
@@ -67,5 +66,4 @@ private:
 
 #undef EXPORT
 
-#endif //INSERTPACKAGEPROCESSOR_H
 

dbcon/dmlpackageproc/tablelockdata.h

@@ -19,8 +19,7 @@
 
 /** @file */
 
-#ifndef TABLELOCKDATA_H__
+#pragma once
-#define TABLELOCKDATA_H__
 
 #include <stdint.h>
 
@@ -63,6 +62,5 @@ private:
 
 #undef EXPORT
 
-#endif
 // vim:ts=4 sw=4:
 

dbcon/dmlpackageproc/updatepackageprocessor.h

@@ -21,8 +21,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef UPDATEPACKAGEPROCESSOR_H
+#pragma once
-#define UPDATEPACKAGEPROCESSOR_H
 #include <string>
 #include "dmlpackageprocessor.h"
 #include "dataconvert.h"
@@ -80,4 +79,3 @@ private:
 
 #undef EXPORT
 
-#endif                                            //UPDATEPACKAGEPROCESSOR_H

dbcon/doc/calpontsystemcatalog.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef DBCON_CALPONTSYSTEMCATALOG_H
+#pragma once
-#define DBCON_CALPONTSYSTEMCATALOG_H
 
 namespace dbcon
 {
@@ -54,5 +53,4 @@ public:
 
 } //namespace dbcon
 
-#endif //DBCON_CALPONTSYSTEMCATALOG_H
 

dbcon/execplan/aggregatecolumn.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef AGGREGATECOLUMN_H
+#pragma once
-#define AGGREGATECOLUMN_H
 #include <string>
 
 #include "calpontselectexecutionplan.h"
@@ -465,5 +464,4 @@ std::ostream& operator<<(std::ostream& os, const AggregateColumn& rhs);
 void getAggCols(ParseTree* n, void* obj);
 
 } //namespace execplan
-#endif //AGGREGATECOLUMN_H
 

dbcon/execplan/arithmeticcolumn.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef ARITHMETICCOLUMN_H
+#pragma once
-#define ARITHMETICCOLUMN_H
 #include <string>
 #include <iosfwd>
 #include <stack>
@@ -283,5 +282,4 @@ private:
 std::ostream& operator<<(std::ostream& output, const ArithmeticColumn& rhs);
 
 }
-#endif //ARITHMETICCOLUMN_H
 

dbcon/execplan/arithmeticoperator.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef ARITHMETICOPERATOR_H
+#pragma once
-#define ARITHMETICOPERATOR_H
 #include <string>
 #include <iosfwd>
 #include <cmath>
@@ -457,5 +456,4 @@ inline void ArithmeticOperator::execute(IDB_Decimal& result, IDB_Decimal op1, ID
 std::ostream& operator<<(std::ostream& os, const ArithmeticOperator& rhs);
 }
 
-#endif
 

dbcon/execplan/blocksize.h

@@ -16,8 +16,7 @@
    MA 02110-1301, USA. */
 
 // $Id: blocksize.h 9210 2013-01-21 14:10:42Z rdempsey $
-#ifndef EXECPLAN_BLOCKSIZE_H_
+#pragma once
-#define EXECPLAN_BLOCKSIZE_H_
 
 #include <stdint.h>
 
@@ -28,5 +27,4 @@ const uint64_t BLOCK_SIZE = 8192;
 // its value is the same as block_size, but different unit
 const uint64_t LOGICAL_BLOCK_RIDS = BLOCK_SIZE;
 
-#endif
 

dbcon/execplan/calpontexecutionplan.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef CALPONTEXECUTIONPLAN_H
+#pragma once
-#define CALPONTEXECUTIONPLAN_H
 #include <string>
 #include <boost/shared_ptr.hpp>
 
@@ -162,5 +161,4 @@ private:
 typedef boost::shared_ptr<CalpontExecutionPlan> SCEP;
 
 }
-#endif //CALPONTEXECUTIONPLAN_H
 

dbcon/execplan/calpontexecutionplanfactory.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef CALPONTEXECUTIONPLANFACTORY_H
+#pragma once
-#define CALPONTEXECUTIONPLANFACTORY_H
 
 #include "calpontexecutionplan.h"
 #include "vendorexecutionplan.h"
@@ -40,5 +39,4 @@ public:
 };
 
 }  //namespace execplan
-#endif //CALPONTEXECUTIONPLANFACTORY_H
 

dbcon/execplan/calpontselectexecutionplan.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef CALPONTSELECTEXECUTIONPLAN_H
+#pragma once
-#define CALPONTSELECTEXECUTIONPLAN_H
 #include <vector>
 #include <map>
 #include <iosfwd>
@@ -942,6 +941,5 @@ inline std::ostream& operator<<(std::ostream& os, const CalpontSelectExecutionPl
 }
 
 }
-#endif //CALPONTSELECTEXECUTIONPLAN_H
 // vim:ts=4 sw=4:
 

dbcon/execplan/calpontsystemcatalog.h

@@ -23,8 +23,7 @@
  ***********************************************************************/
 /** @file */
 
-#ifndef EXECPLAN_CALPONTSYSTEMCATALOG_H
+#pragma once
-#define EXECPLAN_CALPONTSYSTEMCATALOG_H
 
 #include <unistd.h>
 #include <string>
@@ -1227,6 +1226,5 @@ bool ctListSort(const CalpontSystemCatalog::ColType& a, const CalpontSystemCatal
 
 } //namespace execplan
 
-#endif											//EXECPLAN_CALPONTSYSTEMCATALOG_H
 // vim:ts=4 sw=4:
 

dbcon/execplan/clientrotator.h

@@ -23,8 +23,7 @@
 
 /** @file */
 
-#ifndef CLIENTROTATOR_H
+#pragma once
-#define CLIENTROTATOR_H
 
 #include <iostream>
 #include <vector>
@@ -170,6 +169,5 @@ private:
 
 
 } // namespace
-#endif
 // vim:ts=4 sw=4:
 

dbcon/execplan/columnresult.h

@@ -21,8 +21,7 @@
  *****************************************************************************/
 /** @file */
 
-#ifndef EXECPLAN_COLUMNRESULT_H_
+#pragma once
-#define EXECPLAN_COLUMNRESULT_H_
 
 #include <sys/types.h>
 #include <vector>
@@ -114,4 +113,3 @@ private:
 
 }
 
-#endif

dbcon/execplan/constantcolumn.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef CONSTANTCOLUMN_H
+#pragma once
-#define CONSTANTCOLUMN_H
 #include <string>
 
 #include "returnedcolumn.h"
@@ -458,5 +457,4 @@ public:
 std::ostream& operator<<(std::ostream& output, const ConstantColumn& rhs);
 
 }
-#endif //CONSTANTCOLUMN_H
 

dbcon/execplan/constantfilter.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef CONSTANTFILTER_H
+#pragma once
-#define CONSTANTFILTER_H
 #include <string>
 #include <iosfwd>
 #include <vector>
@@ -249,5 +248,4 @@ inline bool ConstantFilter::getBoolVal(rowgroup::Row& row, bool& isNull)
 std::ostream& operator<<(std::ostream& output, const ConstantFilter& rhs);
 
 }
-#endif //CONSTANTFILTER_H
 

dbcon/execplan/existsfilter.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef EXISTSFILTER_H
+#pragma once
-#define EXISTSFILTER_H
 #include <string>
 
 #include "filter.h"
@@ -146,5 +145,4 @@ private:
 std::ostream& operator<<(std::ostream& output, const ExistsFilter& rhs);
 
 }
-#endif //EXISTSFILTER_H
 

dbcon/execplan/exp_templates.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef EXP_TEMPLATES
+#pragma once
-#define EXP_TEMPLATES
 
 #include <iostream>
 #include <fstream>
@@ -672,5 +671,4 @@ private:
 #undef EXP_TEMPLATE
 }
 
-#endif
 

dbcon/execplan/expressionparser.h

@@ -21,8 +21,7 @@
 *
 ***********************************************************************/
 /** @file */
-#ifndef EXPRESSION_PARSER
+#pragma once
-#define EXPRESSION_PARSER
 
 #include <iostream>
 #include <cassert>
@@ -158,4 +157,3 @@ bool operator!=(const ParseTree& t1,
 
 } // namespace execplan
 
-#endif

dbcon/execplan/filter.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef EXECPLAN_FILTER_H
+#pragma once
-#define EXECPLAN_FILTER_H
 #include <string>
 #include <iosfwd>
 
@@ -165,5 +164,4 @@ private:
 std::ostream& operator<<(std::ostream& os, const Filter& rhs);
 
 }
-#endif //EXECPLAN_FILTER_H
 

dbcon/execplan/functioncolumn.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef FUNCTIONCOLUMN_H
+#pragma once
-#define FUNCTIONCOLUMN_H
 #include <string>
 #include <iosfwd>
 #include <vector>
@@ -326,5 +325,4 @@ private:
 std::ostream& operator<<(std::ostream& output, const FunctionColumn& rhs);
 
 }
-#endif //FUNCTIONCOLUMN_H
 

dbcon/execplan/groupconcatcolumn.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef GROUPCONCATCOLUMN_H
+#pragma once
-#define GROUPCONCATCOLUMN_H
 #include <string>
 
 #include "calpontselectexecutionplan.h"
@@ -149,5 +148,4 @@ private:
 std::ostream& operator<<(std::ostream& os, const GroupConcatColumn& rhs);
 
 }
-#endif //GROUPCONCATCOLUMN_H
 

dbcon/execplan/intervalcolumn.h

@@ -23,8 +23,7 @@
 
 /** @file */
 
-#ifndef INTERVALCOLUMN_H
+#pragma once
-#define INTERVALCOLUMN_H
 #include <string>
 #include <iosfwd>
 #include <vector>
@@ -126,4 +125,3 @@ private:
 std::ostream& operator<<(std::ostream& output, const IntervalColumn& rhs);
 
 }
-#endif //INTERVALCOLUMN_H

dbcon/execplan/logicoperator.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef LOGICOPERATOR_H
+#pragma once
-#define LOGICOPERATOR_H
 #include <string>
 #include <iosfwd>
 #include <boost/shared_ptr.hpp>
@@ -186,5 +185,4 @@ private:
 std::ostream& operator<<(std::ostream& os, const LogicOperator& rhs);
 }
 
-#endif
 

dbcon/execplan/mcsanalyzetableexecutionplan.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef MCSANALYZETABLEXEXCUTIONPLAN_H
+#pragma once
-#define MCSANALYZETABLEXEXCUTIONPLAN_H
 #include <vector>
 #include <map>
 #include <iosfwd>
@@ -167,4 +166,3 @@ class MCSAnalyzeTableExecutionPlan : public CalpontExecutionPlan
     uint32_t fLocalQuery;
 };
 } // namespace execplan
-#endif

dbcon/execplan/mysqlexecutionplan.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef MYSQLEXECUTIONPLAN_H
+#pragma once
-#define MYSQLEXECUTIONPLAN_H
 #include <string>
 #include "vendorexecutionplan.h"
 
@@ -97,5 +96,4 @@ private:
      */
 };
 }
-#endif //MYSQLEXECUTIONPLAN_H
 

dbcon/execplan/njlcolumnresult.h

@@ -21,8 +21,7 @@
  *****************************************************************************/
 /** @file */
 
-#ifndef NJLCOLUMNRESULT_H_
+#pragma once
-#define NJLCOLUMNRESULT_H_
 
 #include "columnresult.h"
 
@@ -33,4 +32,3 @@ typedef ColumnResult NJLColumnResult;
 
 }
 
-#endif

dbcon/execplan/objectidmanager.h

@@ -24,8 +24,7 @@
  * class ObjectIDManager interface.
  */
 
-#ifndef OBJECTIDMANAGER_H_
+#pragma once
-#define OBJECTIDMANAGER_H_
 
 #include <string>
 #include <stdint.h>
@@ -195,4 +194,3 @@ private:
 
 }	// namespace
 
-#endif

dbcon/execplan/objectreader.h

@@ -24,8 +24,7 @@
  * class ObjectReader interface
  */
 
-#ifndef EXECPLAN_OBJECTREADER_H
+#pragma once
-#define EXECPLAN_OBJECTREADER_H
 
 #include <exception>
 #include <string>
@@ -170,5 +169,4 @@ public:
 };
 
 }
-#endif // EXECPLAN_OBJECTREADER_H
 

dbcon/execplan/operator.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef OPERATOR_H
+#pragma once
-#define OPERATOR_H
 #include <string>
 #include <iosfwd>
 #include <boost/shared_ptr.hpp>
@@ -245,5 +244,4 @@ std::ostream& operator<<(std::ostream& os, const Operator& rhs);
 }
 
 
-#endif //OPERATOR_H
 

dbcon/execplan/oracleexecutionplan.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef ORACLEEXECUTIONPLAN_H
+#pragma once
-#define ORACLEEXECUTIONPLAN_H
 #include <string>
 #include "vendorexecutionplan.h"
 
@@ -97,5 +96,4 @@ private:
      */
 };
 }
-#endif //ORACLEEXECUTIONPLAN_H
 

dbcon/execplan/outerjoinonfilter.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef OUTERJOINONFILTER_H
+#pragma once
-#define OUTERJOINONFILTER_H
 #include <string>
 
 #include "filter.h"
@@ -125,5 +124,4 @@ private:
 std::ostream& operator<<(std::ostream& output, const OuterJoinOnFilter& rhs);
 
 }
-#endif //OUTERJOINONFILTER_H
 

dbcon/execplan/parsetree.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef PARSETREE_H
+#pragma once
-#define PARSETREE_H
 
 #include <iostream>
 #include <fstream>
@@ -584,4 +583,3 @@ typedef boost::shared_ptr<ParseTree> SPTP;
 
 } // namespace
 
-#endif

dbcon/execplan/predicateoperator.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef PREDICATEOPERATOR_H
+#pragma once
-#define PREDICATEOPERATOR_H
 
 #include <string>
 #include <sstream>
@@ -192,5 +191,4 @@ inline bool PredicateOperator::numericCompare(const result_t op1, const result_t
 std::ostream& operator<<(std::ostream& os, const PredicateOperator& rhs);
 }
 
-#endif //PREDICATEOPERATOR_H
 

dbcon/execplan/pseudocolumn.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef PSEUDOCOLUMN_H
+#pragma once
-#define PSEUDOCOLUMN_H
 #include <string>
 #include "simplecolumn.h"
 
@@ -165,5 +164,4 @@ private:
 
 } // namespace execplan
 
-#endif //PSEUDOCOLUMN_H
 

dbcon/execplan/range.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef RANGE_H
+#pragma once
-#define RANGE_H
 #include <string>
 
 /**
@@ -96,5 +95,4 @@ private:
      */
 };
 }
-#endif //RANGE_H
 

dbcon/execplan/returnedcolumn.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef RETURNEDCOLUMN_H
+#pragma once
-#define RETURNEDCOLUMN_H
 #include <string>
 #include <iosfwd>
 #include <vector>
@@ -382,5 +381,4 @@ protected:
 std::ostream& operator<<(std::ostream& os, const ReturnedColumn& rhs);
 
 }
-#endif //RETURNEDCOLUMN_H
 

dbcon/execplan/rowcolumn.h

@@ -21,8 +21,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef ROWCOLUMN_H
+#pragma once
-#define ROWCOLUMN_H
 #include <string>
 #include <vector>
 #include <boost/shared_ptr.hpp>
@@ -182,5 +181,4 @@ public:
 std::ostream& operator<<(std::ostream& output, const RowColumn& rhs);
 
 }
-#endif //SIMPLECOLUMN_H
 

dbcon/execplan/selectfilter.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef SELECTFILTER_H
+#pragma once
-#define SELECTFILTER_H
 #include <string>
 
 #include "filter.h"
@@ -187,5 +186,4 @@ private:
 std::ostream& operator<<(std::ostream& output, const SelectFilter& rhs);
 
 }
-#endif //SELECTFILTER_H
 

dbcon/execplan/sessionmanager.h

@@ -24,8 +24,7 @@
  * class SessionManager interface
  */
 
-#ifndef _SESSIONMANAGER_H
+#pragma once
-#define _SESSIONMANAGER_H
 
 #include "calpontsystemcatalog.h"
 #include "brm.h"
@@ -216,6 +215,5 @@ private:
 
 }   //namespace
 
-#endif
 // vim:ts=4 sw=4:
 

dbcon/execplan/sessionmonitor.h

@@ -24,8 +24,7 @@
  * class SessionMonitor interface
  */
 
-#ifndef _SESSIONMONITOR_H
+#pragma once
-#define _SESSIONMONITOR_H
 
 #include <vector>
 #include <exception>
@@ -341,4 +340,3 @@ private:
 
 }	//namespace
 
-#endif

dbcon/execplan/simplecolumn.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef SIMPLECOLUMN_H
+#pragma once
-#define SIMPLECOLUMN_H
 #include <string>
 #include <boost/shared_ptr.hpp>
 
@@ -394,5 +393,4 @@ void getSimpleCols(ParseTree* n, void* obj);
 ParseTree* replaceRefCol(ParseTree*& n, CalpontSelectExecutionPlan::ReturnedColumnList&);
 
 }
-#endif //SIMPLECOLUMN_H
 

dbcon/execplan/simplecolumn_decimal.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef SIMPLECOLUMNDECIMAL_H
+#pragma once
-#define SIMPLECOLUMNDECIMAL_H
 #include <iostream>
 #include <string>
 #include <cmath>
@@ -268,5 +267,4 @@ void SimpleColumn_Decimal<len>::unserialize(messageqcpp::ByteStream& b)
 }
 
 }
-#endif //SIMPLECOLUMN_INT_H
 

dbcon/execplan/simplecolumn_int.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef SIMPLECOLUMNINT_H
+#pragma once
-#define SIMPLECOLUMNINT_H
 #include <iostream>
 #include <string>
 
@@ -274,5 +273,4 @@ void SimpleColumn_INT<len>::unserialize(messageqcpp::ByteStream& b)
 }
 
 }
-#endif //SIMPLECOLUMN_INT_H
 

dbcon/execplan/simplecolumn_uint.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef SIMPLECOLUMNUINT_H
+#pragma once
-#define SIMPLECOLUMNUINT_H
 #include <iostream>
 #include <string>
 
@@ -282,5 +281,4 @@ void SimpleColumn_UINT<len>::unserialize(messageqcpp::ByteStream& b)
 }
 
 }
-#endif //SIMPLECOLUMN_INT_H
 

dbcon/execplan/simplefilter.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef SIMPLEFILTER_H
+#pragma once
-#define SIMPLEFILTER_H
 #include <string>
 #include <iosfwd>
 #include <boost/shared_ptr.hpp>
@@ -285,5 +284,4 @@ typedef boost::shared_ptr<SimpleFilter> SSFP;
 std::ostream& operator<<(std::ostream& output, const SimpleFilter& rhs);
 
 }
-#endif //SIMPLEFILTER_H
 

dbcon/execplan/simplescalarfilter.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef SIMPLESCALARFILTER_H
+#pragma once
-#define SIMPLESCALARFILTER_H
 #include <string>
 #include <vector>
 #include <ostream>
@@ -169,5 +168,4 @@ private:
 std::ostream& operator<<(std::ostream& output, const SimpleScalarFilter& rhs);
 
 }
-#endif //SELECTFILTER_H
 

dbcon/execplan/treenode.h

@@ -21,8 +21,7 @@
 
 /** @file */
 
-#ifndef CALPONT_TREENODE_H
+#pragma once
-#define CALPONT_TREENODE_H
 
 #include <string>
 #include <iostream>
@@ -1175,4 +1174,3 @@ std::ostream& operator<<(std::ostream& output, const TreeNode& rhs);
 
 }
 
-#endif

dbcon/execplan/treenodeimpl.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef EXECPLAN_TREENODEIMPL_H
+#pragma once
-#define EXECPLAN_TREENODEIMPL_H
 #include <string>
 #include <iosfwd>
 
@@ -133,5 +132,4 @@ private:
 std::ostream& operator<<(std::ostream& os, const TreeNodeImpl& rhs);
 
 }
-#endif //EXECPLAN_TREENODEIMPL_H
 

dbcon/execplan/udafcolumn.h

@@ -17,8 +17,7 @@
    MA 02110-1301, USA.
 */
 
-#ifndef UDAFCOLUMN_H
+#pragma once
-#define UDAFCOLUMN_H
 #include <string>
 
 #include "calpontselectexecutionplan.h"
@@ -132,5 +131,4 @@ private:
 std::ostream& operator<<(std::ostream& os, const UDAFColumn& rhs);
 
 }
-#endif //UDAFCOLUMN_H
 

dbcon/execplan/vendorexecutionplan.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef EXECPLAN_VENDOREXECUTIONPLAN_H
+#pragma once
-#define EXECPLAN_VENDOREXECUTIONPLAN_H
 
 /**
  * Namespace
@@ -44,5 +43,4 @@ private:
 
 }
 
-#endif //VENDOREXECUTIONPLAN_H
 

dbcon/execplan/wf_frame.h

@@ -18,8 +18,7 @@
    MA 02110-1301, USA.
 */
 
-#ifndef WINDOW_FUNCTION_FRAME_H
+#pragma once
-#define WINDOW_FUNCTION_FRAME_H
 #include <string>
 #include <iosfwd>
 #include <vector>
@@ -88,4 +87,3 @@ struct WF_OrderBy
 };
 
 }
-#endif

dbcon/execplan/windowfunctioncolumn.h

@@ -24,8 +24,7 @@
 
 /** @file */
 
-#ifndef WINDOW_FUNCTION_COLUMN_H
+#pragma once
-#define WINDOW_FUNCTION_COLUMN_H
 #include <string>
 #include <iosfwd>
 #include <vector>
@@ -262,4 +261,3 @@ std::ostream& operator<<(std::ostream& output, const WindowFunctionColumn& rhs);
 void getWindowFunctionCols(ParseTree* n, void* obj);
 
 }
-#endif //WINDOW_FUNCTION_COLUMN_H

dbcon/joblist/bandeddl.h

@@ -33,8 +33,7 @@
 
 #include <time.h>
 
-#ifndef _BANDEDDL_HPP_
+#pragma once
-#define _BANDEDDL_HPP_
 
 namespace joblist
 {
@@ -393,5 +392,4 @@ uint64_t BandedDL<element_t>::totalSize()
 
 }  // namespace
 
-#endif