replace header guards with #pragma once

utils/batchloader/batchloader.h

@@ -24,8 +24,7 @@
  * they are filled in and/or added to the DBRoots for the local PM.
  */
 
-#ifndef BATCHLOADER_H_
-#define BATCHLOADER_H_
+#pragma once
 
 #include <vector>
 #include "oamcache.h"
@@ -130,4 +129,3 @@ private:
 
 #undef EXPORT
 
-#endif // WE_DBROOTEXTENTTRACKER_H_

utils/cacheutils/cacheutils.h

@@ -19,8 +19,7 @@
 //
 /** @file */
 
-#ifndef CACHEUTILS_H__
-#define CACHEUTILS_H__
+#pragma once
 
 #include "brmtypes.h"
 
@@ -75,5 +74,4 @@ int purgePrimProcFdCache(const std::vector<BRM::FileInfo> files, const int pmId)
 }
 // vim:ts=4 sw=4:
 
-#endif
 

utils/cloudio/SMComm.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef SMCOMM_H_
-#define SMCOMM_H_
+#pragma once
 
 #include <sys/stat.h>
 #include <string>
@@ -77,4 +76,3 @@ class SMComm : public boost::noncopyable
 
 }
 
-#endif

utils/cloudio/SMDataFile.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
    
-#ifndef SMDATAFILE_H_
-#define SMDATAFILE_H_
+#pragma once
 
 #include <string>
 #include <boost/utility.hpp>
@@ -58,4 +57,3 @@ class SMDataFile : public IDBDataFile
 
 }
 
-#endif

utils/cloudio/SMFileFactory.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef SMFILEFACTORY_H_
-#define SMFILEFACTORY_H_
+#pragma once
 
 #include "IDBDataFile.h"
 #include "FileFactoryBase.h"
@@ -31,4 +30,3 @@ class SMFileFactory : public FileFactoryBase
 };
 
 }
-#endif

utils/cloudio/SMFileSystem.h

@@ -16,8 +16,7 @@
    MA 02110-1301, USA. */
 
 
-#ifndef SMFILESYSTEM_H_
-#define SMFILESYSTEM_H_
+#pragma once
 
 #include <list>
 #include <string>
@@ -50,4 +49,3 @@ class SMFileSystem : public IDBFileSystem, boost::noncopyable
 
 }
 
-#endif

utils/cloudio/SocketPool.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef _SOCKETPOOL_H_
-#define _SOCKETPOOL_H_
+#pragma once
 
 #include <boost/utility.hpp>
 #include <boost/thread/mutex.hpp>
@@ -56,4 +55,3 @@ class SocketPool : public boost::noncopyable
 
 
 
-#endif

utils/cloudio/sm_exceptions.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef _SMEXECEPTIONS_H_
-#define _SMEXECEPTIONS_H_
+#pragma once
 
 #include <exception>
 
@@ -36,4 +35,3 @@ NotImplementedYet::NotImplementedYet(const std::string &s) :
 }
 
 }
-#endif

utils/common/MonitorProcMem.h

@@ -24,8 +24,7 @@
  *
  */
 
-#ifndef MonitorProcMem_H__
-#define MonitorProcMem_H__
+#pragma once
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -127,4 +126,3 @@ protected:
 
 }
 
-#endif

utils/common/atomicops.h

@@ -17,8 +17,7 @@
 
 /** @file */
 
-#ifndef COMMON_ATOMICOPS_H__
-#define COMMON_ATOMICOPS_H__
+#pragma once
 
 #include <unistd.h>
 #if defined(__linux__)
@@ -177,4 +176,3 @@ inline void atomicYield()
 
 }
 
-#endif

utils/common/branchpred.h

@@ -17,8 +17,7 @@
 
 /** @file */
 
-#ifndef COMMON_BRANCHPRED_H__
-#define COMMON_BRANCHPRED_H__
+#pragma once
 
 #if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
 #ifndef __builtin_expect
@@ -31,5 +30,4 @@
 #define UNLIKELY(x) __builtin_expect((x),0)
 #endif
 
-#endif
 

utils/common/cgroupconfigurator.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef CGROUPCONFIGURATOR_H
-#define CGROUPCONFIGURATOR_H
+#pragma once
 
 #include <stdlib.h>
 #include <inttypes.h>
@@ -73,4 +72,3 @@ private:
 
 }
 
-#endif // CGROUPCONFIGURATOR_H

utils/common/checks.h

@@ -14,8 +14,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 UTILS_COMMON_CHECKS_H
-#define UTILS_COMMON_CHECKS_H
+#pragma once
 
 #include <type_traits>
 #include "mcs_int128.h"
@@ -48,4 +47,3 @@ is_negative(T v) { return v < 0; };
 
 } // namespace utils
 
-#endif // UTILS_COMMON_CHECKS_H

utils/common/collation.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 COLLATION_H_INCLUDED
-#define COLLATION_H_INCLUDED
+#pragma once
 
 #if defined(PREFER_MY_CONFIG_H)
 
@@ -222,4 +221,3 @@ public:
 
 } // end of namespace datatypes
 
-#endif

utils/common/columnwidth.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef UTILS_COLWIDTH_H
-#define UTILS_COLWIDTH_H
+#pragma once
 
 #include "branchpred.h"
 
@@ -89,4 +88,3 @@ namespace utils
 
 }
 
-#endif // UTILS_COLWIDTH_H

utils/common/conststring.h

@@ -16,8 +16,7 @@
    MA 02110-1301, USA. */
 
 
-#ifndef MARIADB_CONSTSTRING_H
-#define MARIADB_CONSTSTRING_H
+#pragma once
 
 
 namespace utils
@@ -61,4 +60,3 @@ public:
 
 } // namespace utils
 
-#endif // MARIADB_CONSTSTRING_H

utils/common/fixedallocator.h

@@ -30,8 +30,7 @@
    TODO: make it STL and boost compliant...
 */
 
-#ifndef FIXEDALLOCATOR_H_
-#define FIXEDALLOCATOR_H_
+#pragma once
 
 #include <stdint.h>
 #include <boost/shared_array.hpp>
@@ -139,4 +138,3 @@ inline void* FixedAllocator::allocate(uint32_t len)
 
 #undef EXPORT
 }  // namespace
-#endif

utils/common/genericparser.h

@@ -16,8 +16,7 @@
    MA 02110-1301, USA. */
 
 
-#ifndef GENERICPARSER_H
-#define GENERICPARSER_H
+#pragma once
 
 #include "conststring.h"
 
@@ -310,4 +309,3 @@ public:
 
 } // namespace genericparser
 
-#endif // GENERICPARSER_H

utils/common/hasher.h

@@ -24,8 +24,7 @@
  * class Hasher interface
  */
 
-#ifndef UTILS_HASHER_H
-#define UTILS_HASHER_H
+#pragma once
 
 #include <stdint.h>
 #include <string.h>
@@ -405,4 +404,3 @@ private:
 
 }
 
-#endif  // UTILS_HASHER_H

utils/common/hashfamily.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef UTILS_HASHFAMILY_H
-#define UTILS_HASHFAMILY_H
+#pragma once
 
 #include "hasher.h"
 #include "collation.h"
@@ -53,5 +52,4 @@ class HashFamily
 };
 
 }
-#endif
 // vim:ts=2 sw=2:

utils/common/mariadb_my_sys.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 MARIADB_MY_SYS_H_INCLUDED
-#define MARIADB_MY_SYS_H_INCLUDED
+#pragma once
 
 // These are the common headers needed to use the MariaDB mysys library.
 
@@ -36,4 +35,3 @@
 
 #include "mcsconfig_conflicting_defs_restore.h"
 
-#endif

utils/common/mcs_basic_types.h

@@ -16,13 +16,11 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. 
 */ 
-#ifndef MCS_BASIC_TYPES_H_INCLUDED
-#define MCS_BASIC_TYPES_H_INCLUDED
+#pragma once
 
 
 using int128_t = __int128;
 using uint128_t = unsigned __int128;
 
 
-#endif // MCS_BASIC_TYPES_H_INCLUDED
 // vim:ts=2 sw=2:

utils/common/nullvaluemanip.h

@@ -16,8 +16,7 @@
    MA 02110-1301, USA. */
 
 
-#ifndef NULLVALUEMANIP_H
-#define NULLVALUEMANIP_H
+#pragma once
 
 #include "../../dbcon/execplan/calpontsystemcatalog.h"
 
@@ -32,4 +31,3 @@ int64_t getSignedNullValue(execplan::CalpontSystemCatalog::ColDataType, uint32_t
 
 }
 
-#endif // NULLVALUEMANIP_H

utils/common/pipe.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef PIPE_H_INCLUDED
-#define PIPE_H_INCLUDED
+#pragma once
 
 /*
   A helper class to hold the file descriptors returned from a pipe() call.
@@ -94,4 +93,3 @@ public:
 };
 
 
-#endif // PIPE_H_INCLUDED

utils/common/poolallocator.h

@@ -23,8 +23,7 @@
 /* This allocator is an attempt to consolidate small allocations and
    deallocations to boost performance and reduce mem fragmentation. */
 
-#ifndef POOLALLOCATOR_H_
-#define POOLALLOCATOR_H_
+#pragma once
 
 #include <unistd.h>
 #include <stdint.h>
@@ -132,4 +131,3 @@ inline void* PoolAllocator::allocate(uint64_t size)
 
 }
 
-#endif

utils/common/robin_hood.h

@@ -30,8 +30,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#ifndef ROBIN_HOOD_H_INCLUDED
-#define ROBIN_HOOD_H_INCLUDED
+#pragma once
 
 // see https://semver.org/
 #define ROBIN_HOOD_VERSION_MAJOR 3  // for incompatible API changes
@@ -2451,4 +2450,3 @@ using unordered_set = detail::Table<sizeof(Key) <= sizeof(size_t) * 6 &&
 
 } // namespace robin_hood
 
-#endif

utils/common/service.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef SERVICE_H_INCLUDED
-#define SERVICE_H_INCLUDED
+#pragma once
 
 #include <signal.h>
 #include "pipe.h"
@@ -113,4 +112,3 @@ public:
     virtual int Child()= 0;
 };
 
-#endif // SERVICE_H_INCLUDED

utils/common/simd_sse.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef UTILS_SIMD_SSE_H
-#define UTILS_SIMD_SSE_H
+#pragma once
 
 #if defined(__x86_64__ )
 
@@ -469,5 +468,4 @@ namespace simd
 
 #endif // if defined(__x86_64__ )
 
-#endif
 // vim:ts=2 sw=2:

utils/common/simpleallocator.h

@@ -24,8 +24,7 @@
  * class SimpleAllocator interface
  */
 
-#ifndef UTILS_SIMPLEALLOCATOR_H
-#define UTILS_SIMPLEALLOCATOR_H
+#pragma once
 
 #include <unistd.h>
 #include <list>
@@ -256,5 +255,4 @@ inline bool operator!=(const SimpleAllocator<T1>&, const SimpleAllocator<T2>&)
 }
 }
 
-#endif  // UTILS_SIMPLEALLOCATOR_H
 

utils/common/statistics.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef STATISTICS_H
-#define STATISTICS_H
+#pragma once
 
 #include "rowgroup.h"
 #include "logger.h"
@@ -123,4 +122,3 @@ class StatisticsDistributor
 };
 
 } // namespace statistics
-#endif

utils/common/stlpoolallocator.h

@@ -29,8 +29,7 @@
 #undef min
 #undef max
 
-#ifndef STLPOOLALLOCATOR_H_
-#define STLPOOLALLOCATOR_H_
+#pragma once
 
 namespace utils
 {
@@ -183,4 +182,3 @@ bool operator!=(const STLPoolAllocator<T>&, const STLPoolAllocator<T>&)
 
 }
 
-#endif

utils/common/syncstream.h

@@ -55,8 +55,7 @@ main()
 }
 */
 
-#ifndef SYNCSTREAM_H__
-#define SYNCSTREAM_H__
+#pragma once
 
 #include <iostream>
 #include <cstdio>
@@ -148,5 +147,4 @@ private:
 
 }
 
-#endif
 

utils/common/threadnaming.h

@@ -14,8 +14,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 H_SETTHREADNAME
-#define H_SETTHREADNAME
+#pragma once
 
 #include <string>
 
@@ -24,4 +23,3 @@ namespace utils
     void setThreadName(const char *threadName);
     std::string getThreadName();
 } // end of namespace
-#endif

utils/common/utils_utf8.h

@@ -19,8 +19,7 @@
 //  $Id$
 
 
-#ifndef _UTILS_UTF8_H_
-#define _UTILS_UTF8_H_
+#pragma once
 
 
 
@@ -158,4 +157,3 @@ int mcs_strcollsp(const std::string* str1, const std::string* str2, const uint32
 int mcs_strcollsp(const std::string& str1, const std::string& str2, const uint32_t charsetNumber);
 } //namespace utf8
 
-#endif

utils/common/vlarray.h

@@ -14,8 +14,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 UTILS_COMMON_VLARRAY_H
-#define UTILS_COMMON_VLARRAY_H
+#pragma once
 
 namespace utils {
 
@@ -97,4 +96,3 @@ private:
 
 } // namespace utils
 
-#endif // UTILS_COMMON_VLARRAY_H

utils/common/widedecimalutils.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef WIDE_DECIMAL_UTILS_H
-#define WIDE_DECIMAL_UTILS_H
+#pragma once
 
 #include <cstdint>
 #include "mcs_basic_types.h"
@@ -46,4 +45,3 @@ namespace utils
     }
 }
 
-#endif // WIDE_DECIMAL_UTILS_H

utils/compress/idbcompress.h

@@ -17,8 +17,7 @@
 
 /** @file */
 
-#ifndef IDBCOMPRESS_H__
-#define IDBCOMPRESS_H__
+#pragma once
 
 #include <unistd.h>
 #ifdef __linux__
@@ -518,5 +517,4 @@ CompressInterface* getCompressInterfaceByType(uint32_t compressionType,
 
 #undef EXPORT
 
-#endif
 

utils/configcpp/configcpp.h

@@ -22,8 +22,7 @@
 /**
  * @file
  */
-#ifndef CONFIG_CONFIGCPP_H
-#define CONFIG_CONFIGCPP_H
+#pragma once
 
 #include <string>
 #include <map>
@@ -258,6 +257,5 @@ private:
 
 #undef EXPORT
 
-#endif
 // vim:ts=4 sw=4:
 

utils/configcpp/configstream.h

@@ -22,8 +22,7 @@
 /**
  * @file
  */
-#ifndef CONFIG_CONFIGSTREAM_H_
-#define CONFIG_CONFIGSTREAM_H_
+#pragma once
 
 #include <string>
 #include <libxml/parser.h>
@@ -63,6 +62,5 @@ private:
 
 } //namespace
 
-#endif
 // vim:ts=4 sw=4:
 

utils/configcpp/md5/md5.h

@@ -56,8 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef HEADER_MD5_H
-#define HEADER_MD5_H
+#pragma once
 
 #include <stddef.h>
 
@@ -113,4 +112,3 @@ void MD5_Transform(MD5_CTX* c, const unsigned char* b);
 }
 #endif
 
-#endif

utils/configcpp/writeonce.h

@@ -22,8 +22,7 @@
 /**
  * @file
  */
-#ifndef CONFIG_WRITEONCECONFIG_H
-#define CONFIG_WRITEONCECONFIG_H
+#pragma once
 
 #include <string>
 #ifndef _MSC_VER
@@ -140,5 +139,4 @@ private:
 
 }
 
-#endif
 

utils/configcpp/xmlparser.h

@@ -22,8 +22,7 @@
 /**
  * @file
  */
-#ifndef CONFIG_XMLPARSER_H_
-#define CONFIG_XMLPARSER_H_
+#pragma once
 
 #include <string>
 #include <vector>
@@ -63,6 +62,5 @@ private:
 
 } //namespace
 
-#endif
 // vim:ts=4 sw=4:
 

utils/dataconvert/dataconvert.h

@@ -22,8 +22,7 @@
 ****************************************************************************/
 /** @file */
 
-#ifndef DATACONVERT_H
-#define DATACONVERT_H
+#pragma once
 
 #include <unistd.h>
 #include <string>
@@ -1784,5 +1783,4 @@ inline int128_t string_to_ll<int128_t> ( const std::string& data, bool& bSaturat
 
 #undef EXPORT
 
-#endif //DATACONVERT_H
 

utils/ddlcleanup/ddlcleanuputil.h

@@ -19,8 +19,7 @@
 //
 /** @file */
 
-#ifndef DDLCLEANUPUTIL_H__
-#define DDLCLEANUPUTIL_H__
+#pragma once
 
 
 /**
@@ -32,5 +31,4 @@ int ddl_cleanup();
 }
 // vim:ts=4 sw=4:
 
-#endif
 

utils/funcexp/funcexp.h

@@ -22,8 +22,7 @@
 ****************************************************************************/
 /** @file */
 
-#ifndef FUNCEXP_H
-#define FUNCEXP_H
+#pragma once
 
 #include <string>
 #include <vector>
@@ -118,5 +117,4 @@ inline void FuncExp::evaluate( rowgroup::RowGroup& rowgroup, execplan::ParseTree
 
 }
 
-#endif
 

utils/funcexp/funcexpwrapper.h

@@ -32,8 +32,7 @@
 
 /** @file */
 
-#ifndef FUNCEXPWRAPPER_H_
-#define FUNCEXPWRAPPER_H_
+#pragma once
 
 #include <parsetree.h>
 #include <returnedcolumn.h>
@@ -81,4 +80,3 @@ inline uint32_t FuncExpWrapper::getFilterCount() const
 
 }
 
-#endif

utils/funcexp/funchelpers.h

@@ -20,8 +20,7 @@
 
 /** @file */
 
-#ifndef FUNCHELPERS_H__
-#define FUNCHELPERS_H__
+#pragma once
 
 #include <string>
 
@@ -793,4 +792,3 @@ const char* convNumToStr(int64_t, char*, int);
 } //namespace funcexp::helpers
 } //namespace funcexp
 
-#endif

utils/funcexp/functor.h

@@ -20,8 +20,7 @@
 
 /** @file */
 
-#ifndef FUNCTOR_H
-#define FUNCTOR_H
+#pragma once
 
 #include <cstdlib>
 #include <string>
@@ -291,7 +290,6 @@ public:
 
 }
 
-#endif
 
 
 

utils/funcexp/functor_all.h

@@ -20,8 +20,7 @@
 
 /** @file */
 
-#ifndef FUNCTOR_ALL_H
-#define FUNCTOR_ALL_H
+#pragma once
 
 #include "functor.h"
 
@@ -606,4 +605,3 @@ public:
 
 }
 
-#endif

utils/funcexp/functor_bool.h

@@ -20,8 +20,7 @@
 
 /** @file */
 
-#ifndef FUNCTOR_BOOL_H
-#define FUNCTOR_BOOL_H
+#pragma once
 
 
 #include "functor.h"
@@ -326,4 +325,3 @@ public:
 
 }
 
-#endif

utils/funcexp/functor_dtm.h

@@ -20,8 +20,7 @@
 
 /** @file */
 
-#ifndef FUNCTOR_DTM_H
-#define FUNCTOR_DTM_H
+#pragma once
 
 #include "functor.h"
 
@@ -580,4 +579,3 @@ public:
 
 }
 
-#endif

utils/funcexp/functor_export.h

@@ -20,8 +20,7 @@
 
 /** @file */
 
-#ifndef FUNCTOR_EXPORT_H
-#define FUNCTOR_EXPORT_H
+#pragma once
 
 
 #include "functor.h"
@@ -82,4 +81,3 @@ private:
 
 }
 
-#endif

utils/funcexp/functor_int.h

@@ -20,8 +20,7 @@
 
 /** @file */
 
-#ifndef FUNCTOR_INT_H
-#define FUNCTOR_INT_H
+#pragma once
 
 #include "functor.h"
 
@@ -752,4 +751,3 @@ public:
 
 }
 
-#endif

utils/funcexp/functor_real.h

@@ -20,8 +20,7 @@
 
 /** @file */
 
-#ifndef FUNCTOR_REAL_H
-#define FUNCTOR_REAL_H
+#pragma once
 
 
 #include "functor.h"
@@ -776,4 +775,3 @@ public:
 
 }
 
-#endif

utils/funcexp/functor_str.h

@@ -20,8 +20,7 @@
 
 /** @file */
 
-#ifndef FUNCTOR_STR_H
-#define FUNCTOR_STR_H
+#pragma once
 
 #include "functor.h"
 #include "sql_crypt.h"
@@ -1021,4 +1020,3 @@ private:
 
 }
 
-#endif

utils/funcexp/sha.h

@@ -46,8 +46,7 @@
  *
  */
 
-#ifndef _SHA1_H_
-#define _SHA1_H_
+#pragma once
 
 namespace funcexp
 {
@@ -110,4 +109,3 @@ private:
 
 } //namespace
 
-#endif

utils/funcexp/sql_crypt.h

@@ -1,5 +1,4 @@
-#ifndef _SQL_CRYPT_H_
-#define _SQL_CRYPT_H_
+#pragma once
 
 //#include "my_global.h"
 /* Macros to make switching between C and C++ mode easier */
@@ -37,4 +36,3 @@ class SQL_CRYPT
 }
 
 
-#endif /* _SQL_CRYPT_H_ */

utils/funcexp/utf8.h

@@ -25,10 +25,8 @@ DEALINGS IN THE SOFTWARE.
 */
 
 
-#ifndef UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#pragma once
 
 #include "utf8/checked.h"
 #include "utf8/unchecked.h"
 
-#endif // header guard

utils/funcexp/utf8/checked.h

@@ -25,8 +25,7 @@ DEALINGS IN THE SOFTWARE.
 */
 
 
-#ifndef UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#pragma once
 
 #include "core.h"
 #include <stdexcept>
@@ -389,6 +388,5 @@ public:
 
 } // namespace utf8
 
-#endif //header guard
 
 

utils/funcexp/utf8/core.h

@@ -25,8 +25,7 @@ DEALINGS IN THE SOFTWARE.
 */
 
 
-#ifndef UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#pragma once
 
 #include <unistd.h>
 #include <iterator>
@@ -336,6 +335,5 @@ inline bool is_bom (octet_iterator it)
 }
 } // namespace utf8
 
-#endif // header guard
 
 

utils/funcexp/utf8/unchecked.h

@@ -25,8 +25,7 @@ DEALINGS IN THE SOFTWARE.
 */
 
 
-#ifndef UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#pragma once
 
 #include "core.h"
 
@@ -250,5 +249,4 @@ public:
 } // namespace utf8
 
 
-#endif // header guard
 

utils/idbdatafile/BufferedFile.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef BUFFEREDFILE_H_
-#define BUFFEREDFILE_H_
+#pragma once
 
 #include <stdexcept>
 #include <boost/utility.hpp>
@@ -64,4 +63,3 @@ private:
 };
 
 }
-#endif /* BUFFEREDFILE_H_ */

utils/idbdatafile/BufferedFileFactory.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef BUFFEREDFILEFACTORY_H_
-#define BUFFEREDFILEFACTORY_H_
+#pragma once
 
 #include "FileFactoryBase.h"
 #include "BufferedFile.h"
@@ -39,4 +38,3 @@ IDBDataFile* BufferedFileFactory::open(const char* fname, const char* mode, unsi
 }
 
 }
-#endif /* BUFFEREDFILEFACTORY_H_ */

utils/idbdatafile/FileFactoryBase.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef FILEFACTORYBASE_H_
-#define FILEFACTORYBASE_H_
+#pragma once
 
 namespace idbdatafile
 {
@@ -31,4 +30,3 @@ public:
 };
 
 }
-#endif /* FILEFACTORYBASE_H_ */

utils/idbdatafile/IDBDataFile.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef IDBDATAFILE_H_
-#define IDBDATAFILE_H_
+#pragma once
 #define _FILE_OFFSET_BITS 64
 #include <stdlib.h>
 #include <string>
@@ -247,4 +246,3 @@ const std::string& IDBDataFile::name() const
 }
 
 }
-#endif /* IDBDATAFILE_H_ */

utils/idbdatafile/IDBFactory.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef IDBFACTORY_H_
-#define IDBFACTORY_H_
+#pragma once
 
 #include <string>
 #include <map>
@@ -124,4 +123,3 @@ const std::string& IDBFactory::name(IDBDataFile::Types type)
 
 }
 
-#endif /* IDBFACTORY_H_ */

utils/idbdatafile/IDBFileSystem.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef IDBFILESYSTEM_H_
-#define IDBFILESYSTEM_H_
+#pragma once
 
 #include <sys/types.h>
 #include <list>
@@ -166,4 +165,3 @@ IDBFileSystem& IDBFileSystem::getFs(IDBDataFile::Types type)
 
 }
 
-#endif /* IDBFILESYSTEM_H_ */

utils/idbdatafile/IDBLogger.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef IDBLOGGER_H_
-#define IDBLOGGER_H_
+#pragma once
 
 #include <string>
 #include "IDBDataFile.h"
@@ -69,4 +68,3 @@ bool IDBLogger::isEnabled()
 
 }
 
-#endif /* IDBLOGGER_H_ */

utils/idbdatafile/IDBPolicy.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef IDBPOLICY_H_
-#define IDBPOLICY_H_
+#pragma once
 
 #include <string>
 #include <vector>
@@ -253,4 +252,3 @@ int IDBPolicy::copyFile(const char* srcPath, const char* destPath)
 
 }
 
-#endif /* IDBPOLICY_H_ */

utils/idbdatafile/PosixFileSystem.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef POSIXFILESYSTEM_H_
-#define POSIXFILESYSTEM_H_
+#pragma once
 
 #include "IDBFileSystem.h"
 
@@ -46,4 +45,3 @@ public:
 
 }
 
-#endif /* POSIXFILESYSTEM_H_ */

utils/idbdatafile/UnbufferedFile.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef UNBUFFEREDFILE_H_
-#define UNBUFFEREDFILE_H_
+#pragma once
 
 #include <stdexcept>
 #include <unistd.h>
@@ -63,4 +62,3 @@ private:
 
 }
 
-#endif /* UNBUFFEREDFILE_H_ */

utils/idbdatafile/UnbufferedFileFactory.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef UNBUFFEREDFILEFACTORY_H_
-#define UNBUFFEREDFILEFACTORY_H_
+#pragma once
 
 #include "FileFactoryBase.h"
 #include "UnbufferedFile.h"
@@ -39,4 +38,3 @@ IDBDataFile* UnbufferedFileFactory::open(const char* fname, const char* mode, un
 }
 
 }
-#endif /* UNBUFFEREDFILEFACTORY_H_ */

utils/idbdatafile/largefile64.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef _LARGEFILE64_H
-#define _LARGEFILE64_H
+#pragma once
 
 #ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
@@ -43,4 +42,3 @@ typedef int64_t off64_t;
 #  endif
 #endif
 
-#endif

utils/idbdatafile/utility.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef UTILITY_H_
-#define UTILITY_H_
+#pragma once
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -117,4 +116,3 @@ int modeStrToFlags(const char* mode, int& createflags)
 
 }
 
-#endif /* UTILITY_H_ */

utils/joiner/btree.h

@@ -97,8 +97,7 @@
 // BM_map_string_fifo          398      596  -49.75%  <256>    [72.0, 44.0]
 // BM_map_string_fwditer       243      113  +53.50%  <256>    [72.0, 55.8]
 
-#ifndef UTIL_BTREE_BTREE_H__
-#define UTIL_BTREE_BTREE_H__
+#pragma once
 
 #include <assert.h>
 #include <stddef.h>
@@ -2909,4 +2908,3 @@ void btree_iterator<N, R, P>::decrement_slow()
 
 } // namespace btree
 
-#endif  // UTIL_BTREE_BTREE_H__

utils/joiner/btree_container.h

@@ -12,8 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef UTIL_BTREE_BTREE_CONTAINER_H__
-#define UTIL_BTREE_BTREE_CONTAINER_H__
+#pragma once
 
 #include <iosfwd>
 #include <utility>
@@ -457,4 +456,3 @@ public:
 
 } // namespace btree
 
-#endif  // UTIL_BTREE_BTREE_CONTAINER_H__

utils/joiner/btree_map.h

@@ -19,8 +19,7 @@
 // multimap<>) using a btree. See btree.h for details of the btree
 // implementation and caveats.
 
-#ifndef UTIL_BTREE_BTREE_MAP_H__
-#define UTIL_BTREE_BTREE_MAP_H__
+#pragma once
 
 #include <algorithm>
 #include <functional>
@@ -138,4 +137,3 @@ inline void swap(btree_multimap<K, V, C, A, N>& x,
 
 } // namespace btree
 
-#endif  // UTIL_BTREE_BTREE_MAP_H__

utils/joiner/btree_set.h

@@ -17,8 +17,7 @@
 // multiple sorted associative container interface (a.k.a multiset<>) using a
 // btree. See btree.h for details of the btree implementation and caveats.
 
-#ifndef UTIL_BTREE_BTREE_SET_H__
-#define UTIL_BTREE_BTREE_SET_H__
+#pragma once
 
 #include <functional>
 #include <memory>
@@ -129,4 +128,3 @@ inline void swap(btree_multiset<K, C, A, N>& x,
 
 } // namespace btree
 
-#endif  // UTIL_BTREE_BTREE_SET_H__

utils/joiner/joiner.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef JOINER_H_
-#define JOINER_H_
+#pragma once
 
 #include <iostream>
 #include <vector>
@@ -207,4 +206,3 @@ private:
 
 }
 
-#endif

utils/joiner/joinpartition.h

@@ -16,8 +16,7 @@
    MA 02110-1301, USA. */
 
 
-#ifndef JOINPARTITION_H
-#define JOINPARTITION_H
+#pragma once
 
 #include "rowgroup.h"
 #include "hasher.h"
@@ -180,4 +179,3 @@ private:
 
 }
 
-#endif // JOINPARTITION_H

utils/joiner/tuplejoiner.h

@@ -16,8 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef TJOINER_H_
-#define TJOINER_H_
+#pragma once
 
 #include <iostream>
 #include <vector>
@@ -581,4 +580,3 @@ private:
 
 }
 
-#endif

utils/loggingcpp/errorcodes.h

@@ -21,8 +21,7 @@
 *
 ***********************************************************************/
 /** @file */
-#ifndef LOGGING_ERRORCODES_H
-#define LOGGING_ERRORCODES_H
+#pragma once
 
 #include <sys/types.h>
 #include <map>
@@ -97,5 +96,4 @@ private:
 };
 
 }
-#endif //LOGGING_ERRORCODES_H
 

utils/loggingcpp/exceptclasses.h

@@ -22,8 +22,7 @@
 
 /** @file */
 
-#ifndef LOGGING_EXCEPTCLASSES_H
-#define LOGGING_EXCEPTCLASSES_H
+#pragma once
 
 #include <iostream>
 #include <sstream>
@@ -278,5 +277,4 @@ public:
 }
 
 
-#endif
 // vim:ts=4 sw=4:

utils/loggingcpp/idberrorinfo.h

@@ -22,8 +22,7 @@
 /**
  * @file
  */
-#ifndef LOGGING_IDBERRORINFO_H
-#define LOGGING_IDBERRORINFO_H
+#pragma once
 
 #include <string>
 #include <map>
@@ -65,4 +64,3 @@ private:
 
 }//namespace logging
 
-#endif

utils/loggingcpp/logger.h

@@ -21,8 +21,7 @@
 
 /** @file */
 
-#ifndef LOGGING_LOGGER_H_
-#define LOGGING_LOGGER_H_
+#pragma once
 
 #include <string>
 #include <map>
@@ -92,5 +91,4 @@ typedef boost::shared_ptr<Logger> SPL;
 
 }
 
-#endif
 

utils/loggingcpp/loggingid.h

@@ -22,8 +22,7 @@
 /**
  * @file
  */
-#ifndef LOGGING_LOGGINGID_H
-#define LOGGING_LOGGINGID_H
+#pragma once
 
 #include <string>
 
@@ -50,4 +49,3 @@ struct LoggingID
 
 }
 
-#endif

utils/loggingcpp/messagelog.h

@@ -22,8 +22,7 @@
 /**
  * @file
  */
-#ifndef LOGGING_MESSAGELOG_H
-#define LOGGING_MESSAGELOG_H
+#pragma once
 
 #include <syslog.h>
 
@@ -154,4 +153,3 @@ void logEventToDataLog(unsigned messageId, const std::string& messageText);
 
 }
 
-#endif

utils/loggingcpp/messageobj.h

@@ -22,8 +22,7 @@
 /**
  * @file
  */
-#ifndef LOGGING_MESSAGEOBJ_H
-#define LOGGING_MESSAGEOBJ_H
+#pragma once
 
 #include <string>
 #include <vector>
@@ -163,4 +162,3 @@ inline void swap(logging::Message& lhs, logging::Message& rhs)
 }//namespace logging
 
 
-#endif

utils/loggingcpp/sqllogger.h

@@ -23,8 +23,7 @@
 
 /** @file */
 
-#ifndef LOGGING_SQLLOGGER_H_
-#define LOGGING_SQLLOGGER_H_
+#pragma once
 
 #include <string>
 
@@ -60,5 +59,4 @@ private:
 };
 
 }
-#endif
 

utils/loggingcpp/stopwatch.h

@@ -59,8 +59,7 @@
 // 0.30553  100  %      1          Total
 //
 // Note that you can have overlapping timers which will make your percentages add up to more than 100%.
-#ifndef LOGGING_STOPWATCH_H
-#define LOGGING_STOPWATCH_H
+#pragma once
 #include <iostream>
 #include <fstream>
 #include <list>
@@ -138,4 +137,3 @@ private:
 
 } // end of logging namespace
 
-#endif //  STOPWATCH_H

utils/messageqcpp/bytestream.h

@@ -18,8 +18,7 @@
    MA 02110-1301, USA.
 */
 
-#ifndef MESSAGEQCPP_BYTESTREAM_H
-#define MESSAGEQCPP_BYTESTREAM_H
+#pragma once
 
 #include <string>
 #include <iostream>
@@ -762,4 +761,3 @@ template<> inline void swap<messageqcpp::ByteStream>(messageqcpp::ByteStream& lh
 
 #undef EXPORT
 
-#endif //MESSAGEQCPP_BYTESTREAM_H

utils/messageqcpp/bytestreampool.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
    
-#ifndef BYTESTREAMPOOL_H_
-#define BYTESTREAMPOOL_H_
+#pragma once
 
 /* This class defines a pool of bytestreams to improve BS reuse, reducing
 the need to use the dynamic allocator.  It allocates as many BS's as needed,
@@ -51,4 +50,3 @@ class ByteStreamPool
 
 }
 
-#endif

utils/messageqcpp/compressed_iss.h

@@ -21,8 +21,7 @@
 *
 ***********************************************************************/
 /** @file */
-#ifndef MESSAGEQCPP_COMPRESSED_ISS_H
-#define MESSAGEQCPP_COMPRESSED_ISS_H
+#pragma once
 
 #include <unistd.h>
 #ifndef _MSC_VER
@@ -63,4 +62,3 @@ private:
 
 #undef EXPORT
 
-#endif

utils/messageqcpp/inetstreamsocket.h

@@ -21,8 +21,7 @@
 *
 ***********************************************************************/
 /** @file */
-#ifndef MESSAGEQCPP_INETSTREAMSOCKET_H
-#define MESSAGEQCPP_INETSTREAMSOCKET_H
+#pragma once
 
 #include <ctime>
 #include <unistd.h>
@@ -288,5 +287,4 @@ inline std::ostream& operator<<(std::ostream& os, const InetStreamSocket& rhs)
 
 #undef EXPORT
 
-#endif //MESSAGEQCPP_INETSTREAMSOCKET_H
 

utils/messageqcpp/iosocket.h

@@ -21,8 +21,7 @@
 *
 ***********************************************************************/
 /** @file */
-#ifndef MESSAGEQCPP_IOSOCKET_H
-#define MESSAGEQCPP_IOSOCKET_H
+#pragma once
 
 #include <string>
 #include <cassert>
@@ -308,5 +307,4 @@ inline std::ostream& operator<<(std::ostream& os, const IOSocket& rhs)
 
 #undef EXPORT
 
-#endif //MESSAGEQCPP_IOSOCKET_H
 

utils/messageqcpp/messagequeue.h

@@ -21,8 +21,7 @@
 *
 ******************************************************************************************/
 /** @file */
-#ifndef MESSAGEQCPP_MESSAGEQUEUE_H
-#define MESSAGEQCPP_MESSAGEQUEUE_H
+#pragma once
 #include <string>
 #include <ctime>
 
@@ -335,6 +334,5 @@ inline void MessageQueueClient::syncProto(bool use)
 
 #undef EXPORT
 
-#endif //MESSAGEQCPP_MESSAGEQUEUE_H
 // vim:ts=4 sw=4:
 

utils/messageqcpp/messagequeuepool.h

@@ -15,8 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#ifndef MESSAGEQCPP_MESSAGEQUEUECLIENT_H
-#define MESSAGEQCPP_MESSAGEQUEUECLIENT_H
+#pragma once
 
 #include <map>
 #include "messagequeue.h"
@@ -55,4 +54,3 @@ private:
 };
 
 }
-#endif //MESSAGEQCPP_MESSAGEQUEUECLIENT_H

utils/messageqcpp/serializeable.h

@@ -24,8 +24,7 @@
  * class XXX interface
  */
 
-#ifndef _SERIALIZEABLE_H_
-#define _SERIALIZEABLE_H_
+#pragma once
 
 namespace messageqcpp
 {
@@ -58,4 +57,3 @@ public:
 
 }
 
-#endif

utils/messageqcpp/serversocket.h

@@ -21,8 +21,7 @@
 *
 ***********************************************************************/
 /** @file */
-#ifndef MESSAGEQCPP_SERVERSOCKET_H
-#define MESSAGEQCPP_SERVERSOCKET_H
+#pragma once
 
 #include <sys/types.h>
 #ifdef _MSC_VER
@@ -171,5 +170,4 @@ inline void ServerSocket::syncProto(bool use)
 
 } //namespace messageqcpp
 
-#endif //MESSAGEQCPP_SERVERSOCKET_H
 

utils/messageqcpp/socket.h

@@ -21,8 +21,7 @@
 *
 ***********************************************************************/
 /** @file */
-#ifndef MESSAGEQCPP_SOCKET_H
-#define MESSAGEQCPP_SOCKET_H
+#pragma once
 
 #include <ctime>
 #include <unistd.h>
@@ -184,5 +183,4 @@ public:
 
 } //namespace messageqcpp
 
-#endif //MESSAGEQCPP_SOCKET_H