replace header guards with #pragma once

dbcon/dmlpackage/calpontdmlfactory.h

@@ -21,8 +21,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef CALPONTDMLFACTORY_H
-#define CALPONTDMLFACTORY_H
+#pragma once
 #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
-#define CALPONTDMLPACKAGE_H
+#pragma once
 #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
-#define COMMANDDMLPACKAGE_H
+#pragma once
 #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
-#define DELETEDMLPACKAGE_H
+#pragma once
 #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
-# define YYTOKENTYPE
+#pragma once
 /* 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
-#define DMLCOLUMN_H
+#pragma once
 #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
-#define DMLOBJECT_H
+#pragma once
 #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
-#define DMLPACKAGE_H
+#pragma once
 
 #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
-#define DMLPARSER_H
+#pragma once
 
 #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
-#define DMLPKG_H
+#pragma once
 
 #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
-#define DMLTABLE_H
+#pragma once
 
 #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
-#define INSERTDMLPACKAGE_H
+#pragma once
 #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
-#define MYSQLDMLSTATEMENT_H
+#pragma once
 #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
-#define ORACLEDMLSTATEMENT_H
+#pragma once
 #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
-#define ROW_H
+#pragma once
 #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
-#define UPDATEDMLPACKAGE_H
+#pragma once
 #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
-#define VENDORDMLSTATEMENT_H
+#pragma once
 #include <string>
 #include <vector>
 #include <map>
@@ -250,4 +249,3 @@ private:
 
 #undef EXPORT
 
-#endif                                            //VENDORDMLSTATEMENT_H