replace header guards with #pragma once

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