replace header guards with #pragma once

dbcon/execplan/aggregatecolumn.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef AGGREGATECOLUMN_H
-#define AGGREGATECOLUMN_H
+#pragma once
 #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
-#define ARITHMETICCOLUMN_H
+#pragma once
 #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
-#define ARITHMETICOPERATOR_H
+#pragma once
 #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_
-#define EXECPLAN_BLOCKSIZE_H_
+#pragma once
 
 #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
-#define CALPONTEXECUTIONPLAN_H
+#pragma once
 #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
-#define CALPONTEXECUTIONPLANFACTORY_H
+#pragma once
 
 #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
-#define CALPONTSELECTEXECUTIONPLAN_H
+#pragma once
 #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
-#define EXECPLAN_CALPONTSYSTEMCATALOG_H
+#pragma once
 
 #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
-#define CLIENTROTATOR_H
+#pragma once
 
 #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_
-#define EXECPLAN_COLUMNRESULT_H_
+#pragma once
 
 #include <sys/types.h>
 #include <vector>
@@ -114,4 +113,3 @@ private:
 
 }
 
-#endif

dbcon/execplan/constantcolumn.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef CONSTANTCOLUMN_H
-#define CONSTANTCOLUMN_H
+#pragma once
 #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
-#define CONSTANTFILTER_H
+#pragma once
 #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
-#define EXISTSFILTER_H
+#pragma once
 #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
-#define EXP_TEMPLATES
+#pragma once
 
 #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
-#define EXPRESSION_PARSER
+#pragma once
 
 #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
-#define EXECPLAN_FILTER_H
+#pragma once
 #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
-#define FUNCTIONCOLUMN_H
+#pragma once
 #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
-#define GROUPCONCATCOLUMN_H
+#pragma once
 #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
-#define INTERVALCOLUMN_H
+#pragma once
 #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
-#define LOGICOPERATOR_H
+#pragma once
 #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
-#define MCSANALYZETABLEXEXCUTIONPLAN_H
+#pragma once
 #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
-#define MYSQLEXECUTIONPLAN_H
+#pragma once
 #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_
-#define NJLCOLUMNRESULT_H_
+#pragma once
 
 #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_
-#define OBJECTIDMANAGER_H_
+#pragma once
 
 #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
-#define EXECPLAN_OBJECTREADER_H
+#pragma once
 
 #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
-#define OPERATOR_H
+#pragma once
 #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
-#define ORACLEEXECUTIONPLAN_H
+#pragma once
 #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
-#define OUTERJOINONFILTER_H
+#pragma once
 #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
-#define PARSETREE_H
+#pragma once
 
 #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
-#define PREDICATEOPERATOR_H
+#pragma once
 
 #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
-#define PSEUDOCOLUMN_H
+#pragma once
 #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
-#define RANGE_H
+#pragma once
 #include <string>
 
 /**
@@ -96,5 +95,4 @@ private:
      */
 };
 }
-#endif //RANGE_H
 

dbcon/execplan/returnedcolumn.h

@@ -22,8 +22,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef RETURNEDCOLUMN_H
-#define RETURNEDCOLUMN_H
+#pragma once
 #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
-#define ROWCOLUMN_H
+#pragma once
 #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
-#define SELECTFILTER_H
+#pragma once
 #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
-#define _SESSIONMANAGER_H
+#pragma once
 
 #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
-#define _SESSIONMONITOR_H
+#pragma once
 
 #include <vector>
 #include <exception>
@@ -341,4 +340,3 @@ private:
 
 }	//namespace
 
-#endif

dbcon/execplan/simplecolumn.h

@@ -23,8 +23,7 @@
 ***********************************************************************/
 /** @file */
 
-#ifndef SIMPLECOLUMN_H
-#define SIMPLECOLUMN_H
+#pragma once
 #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
-#define SIMPLECOLUMNDECIMAL_H
+#pragma once
 #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
-#define SIMPLECOLUMNINT_H
+#pragma once
 #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
-#define SIMPLECOLUMNUINT_H
+#pragma once
 #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
-#define SIMPLEFILTER_H
+#pragma once
 #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
-#define SIMPLESCALARFILTER_H
+#pragma once
 #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
-#define CALPONT_TREENODE_H
+#pragma once
 
 #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
-#define EXECPLAN_TREENODEIMPL_H
+#pragma once
 #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
-#define UDAFCOLUMN_H
+#pragma once
 #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
-#define EXECPLAN_VENDOREXECUTIONPLAN_H
+#pragma once
 
 /**
  * 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
-#define WINDOW_FUNCTION_FRAME_H
+#pragma once
 #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
-#define WINDOW_FUNCTION_COLUMN_H
+#pragma once
 #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