From 01f3ceb437cfd7d69ffffa90e8e992f858e96544 Mon Sep 17 00:00:00 2001 From: Leonid Fedorov Date: Tue, 14 Dec 2021 20:06:05 +0300 Subject: [PATCH] replace header guards with #pragma once --- datatypes/mcs_data_condition.h | 4 +--- datatypes/mcs_datatype.h | 4 +--- datatypes/mcs_datatype_basic.h | 4 +--- datatypes/mcs_decimal.h | 4 +--- datatypes/mcs_double.h | 4 +--- datatypes/mcs_float128.h | 4 +--- datatypes/mcs_int128.h | 4 +--- datatypes/mcs_int64.h | 4 +--- datatypes/mcs_longdouble.h | 4 +--- datatypes/mcs_numeric_limits.h | 4 +--- datatypes/mcs_string.h | 4 +--- datatypes/numericliteral.h | 4 +--- dbcon/ddlpackage/ddl-gram-win.h | 4 +--- dbcon/ddlpackage/ddlpkg.h | 4 +--- dbcon/ddlpackageproc/altertableprocessor.h | 4 +--- dbcon/ddlpackageproc/createindexprocessor.h | 4 +--- dbcon/ddlpackageproc/createtableprocessor.h | 4 +--- dbcon/ddlpackageproc/ddlpackageprocessor.h | 4 +--- dbcon/ddlpackageproc/ddlpackageprocessorfactory.h | 4 +--- dbcon/ddlpackageproc/dropindexprocessor.h | 4 +--- dbcon/ddlpackageproc/droppartitionprocessor.h | 4 +--- dbcon/ddlpackageproc/droptableprocessor.h | 4 +--- dbcon/ddlpackageproc/markpartitionprocessor.h | 4 +--- dbcon/ddlpackageproc/restorepartitionprocessor.h | 4 +--- dbcon/dmlpackage/calpontdmlfactory.h | 4 +--- dbcon/dmlpackage/calpontdmlpackage.h | 4 +--- dbcon/dmlpackage/commanddmlpackage.h | 4 +--- dbcon/dmlpackage/deletedmlpackage.h | 4 +--- dbcon/dmlpackage/dml-gram-win.h | 4 +--- dbcon/dmlpackage/dmlcolumn.h | 4 +--- dbcon/dmlpackage/dmlobject.h | 4 +--- dbcon/dmlpackage/dmlpackage.h | 4 +--- dbcon/dmlpackage/dmlparser.h | 4 +--- dbcon/dmlpackage/dmlpkg.h | 4 +--- dbcon/dmlpackage/dmltable.h | 4 +--- dbcon/dmlpackage/insertdmlpackage.h | 4 +--- dbcon/dmlpackage/mysqldmlstatement.h | 4 +--- dbcon/dmlpackage/oracledmlstatement.h | 4 +--- dbcon/dmlpackage/row.h | 4 +--- dbcon/dmlpackage/updatedmlpackage.h | 4 +--- dbcon/dmlpackage/vendordmlstatement.h | 4 +--- dbcon/dmlpackageproc/autoincrementdata.h | 4 +--- dbcon/dmlpackageproc/commandpackageprocessor.h | 4 +--- dbcon/dmlpackageproc/deletepackageprocessor.h | 4 +--- dbcon/dmlpackageproc/dmlpackageprocessor.h | 4 +--- dbcon/dmlpackageproc/dmlpackageprocessorfactory.h | 4 +--- dbcon/dmlpackageproc/insertpackageprocessor.h | 4 +--- dbcon/dmlpackageproc/tablelockdata.h | 4 +--- dbcon/dmlpackageproc/updatepackageprocessor.h | 4 +--- dbcon/doc/calpontsystemcatalog.h | 4 +--- dbcon/execplan/aggregatecolumn.h | 4 +--- dbcon/execplan/arithmeticcolumn.h | 4 +--- dbcon/execplan/arithmeticoperator.h | 4 +--- dbcon/execplan/blocksize.h | 4 +--- dbcon/execplan/calpontexecutionplan.h | 4 +--- dbcon/execplan/calpontexecutionplanfactory.h | 4 +--- dbcon/execplan/calpontselectexecutionplan.h | 4 +--- dbcon/execplan/calpontsystemcatalog.h | 4 +--- dbcon/execplan/clientrotator.h | 4 +--- dbcon/execplan/columnresult.h | 4 +--- dbcon/execplan/constantcolumn.h | 4 +--- dbcon/execplan/constantfilter.h | 4 +--- dbcon/execplan/existsfilter.h | 4 +--- dbcon/execplan/exp_templates.h | 4 +--- dbcon/execplan/expressionparser.h | 4 +--- dbcon/execplan/filter.h | 4 +--- dbcon/execplan/functioncolumn.h | 4 +--- dbcon/execplan/groupconcatcolumn.h | 4 +--- dbcon/execplan/intervalcolumn.h | 4 +--- dbcon/execplan/logicoperator.h | 4 +--- dbcon/execplan/mcsanalyzetableexecutionplan.h | 4 +--- dbcon/execplan/mysqlexecutionplan.h | 4 +--- dbcon/execplan/njlcolumnresult.h | 4 +--- dbcon/execplan/objectidmanager.h | 4 +--- dbcon/execplan/objectreader.h | 4 +--- dbcon/execplan/operator.h | 4 +--- dbcon/execplan/oracleexecutionplan.h | 4 +--- dbcon/execplan/outerjoinonfilter.h | 4 +--- dbcon/execplan/parsetree.h | 4 +--- dbcon/execplan/predicateoperator.h | 4 +--- dbcon/execplan/pseudocolumn.h | 4 +--- dbcon/execplan/range.h | 4 +--- dbcon/execplan/returnedcolumn.h | 4 +--- dbcon/execplan/rowcolumn.h | 4 +--- dbcon/execplan/selectfilter.h | 4 +--- dbcon/execplan/sessionmanager.h | 4 +--- dbcon/execplan/sessionmonitor.h | 4 +--- dbcon/execplan/simplecolumn.h | 4 +--- dbcon/execplan/simplecolumn_decimal.h | 4 +--- dbcon/execplan/simplecolumn_int.h | 4 +--- dbcon/execplan/simplecolumn_uint.h | 4 +--- dbcon/execplan/simplefilter.h | 4 +--- dbcon/execplan/simplescalarfilter.h | 4 +--- dbcon/execplan/treenode.h | 4 +--- dbcon/execplan/treenodeimpl.h | 4 +--- dbcon/execplan/udafcolumn.h | 4 +--- dbcon/execplan/vendorexecutionplan.h | 4 +--- dbcon/execplan/wf_frame.h | 4 +--- dbcon/execplan/windowfunctioncolumn.h | 4 +--- dbcon/joblist/bandeddl.h | 4 +--- dbcon/joblist/batchprimitiveprocessor-jl.h | 4 +--- dbcon/joblist/bucketdl.h | 4 +--- dbcon/joblist/columncommand-jl.h | 4 +--- dbcon/joblist/command-jl.h | 4 +--- dbcon/joblist/crossenginestep.h | 4 +--- dbcon/joblist/datalist.h | 4 +--- dbcon/joblist/datalistimpl.h | 4 +--- dbcon/joblist/dictstep-jl.h | 4 +--- dbcon/joblist/diskjoinstep.h | 4 +--- dbcon/joblist/distributedenginecomm.h | 4 +--- dbcon/joblist/elementcompression.h | 4 +--- dbcon/joblist/elementtype.h | 4 +--- dbcon/joblist/errorinfo.h | 4 +--- dbcon/joblist/expressionstep.h | 4 +--- dbcon/joblist/fifo.h | 4 +--- dbcon/joblist/filtercommand-jl.h | 4 +--- dbcon/joblist/groupconcat.h | 4 +--- dbcon/joblist/jl_logger.h | 4 +--- dbcon/joblist/jlf_common.h | 4 +--- dbcon/joblist/jlf_execplantojoblist.h | 4 +--- dbcon/joblist/jlf_graphics.h | 4 +--- dbcon/joblist/jlf_subquery.h | 4 +--- dbcon/joblist/jlf_tuplejoblist.h | 4 +--- dbcon/joblist/joblist.h | 4 +--- dbcon/joblist/joblistfactory.h | 4 +--- dbcon/joblist/joblisttypes.h | 4 +--- dbcon/joblist/jobstep.h | 4 +--- dbcon/joblist/largedatalist.h | 4 +--- dbcon/joblist/largehashjoin.h | 4 +--- dbcon/joblist/lbidlist.h | 4 +--- dbcon/joblist/limitedorderby.h | 4 +--- dbcon/joblist/passthrucommand-jl.h | 4 +--- dbcon/joblist/primitivemsg.h | 4 +--- dbcon/joblist/primitivestep.h | 4 +--- dbcon/joblist/pseudocc-jl.h | 4 +--- dbcon/joblist/resourcedistributor.h | 4 +--- dbcon/joblist/resourcemanager.h | 4 +--- dbcon/joblist/rowestimator.h | 4 +--- dbcon/joblist/rtscommand-jl.h | 4 +--- dbcon/joblist/subquerystep.h | 4 +--- dbcon/joblist/subquerytransformer.h | 4 +--- dbcon/joblist/tablecolumn.h | 4 +--- dbcon/joblist/threadsafequeue.h | 4 +--- dbcon/joblist/timeset.h | 4 +--- dbcon/joblist/timestamp.h | 4 +--- dbcon/joblist/tupleaggregatestep.h | 4 +--- dbcon/joblist/tupleannexstep.h | 4 +--- dbcon/joblist/tupleconstantstep.h | 4 +--- dbcon/joblist/tuplehashjoin.h | 4 +--- dbcon/joblist/tuplehavingstep.h | 4 +--- dbcon/joblist/tupleunion.h | 4 +--- dbcon/joblist/unique32generator.h | 4 +--- dbcon/joblist/virtualtable.h | 4 +--- dbcon/joblist/windowfunctionstep.h | 4 +--- dbcon/mysql/ha_mcs.h | 4 +--- dbcon/mysql/ha_mcs_datatype.h | 4 +--- dbcon/mysql/ha_mcs_impl.h | 4 +--- dbcon/mysql/ha_mcs_impl_if.h | 4 +--- dbcon/mysql/ha_mcs_logging.h | 4 +--- dbcon/mysql/ha_mcs_opt_rewrites.h | 4 +--- dbcon/mysql/ha_mcs_pushdown.h | 4 +--- dbcon/mysql/ha_mcs_sysvars.h | 4 +--- dbcon/mysql/ha_subquery.h | 4 +--- dbcon/mysql/ha_tzinfo.h | 4 +--- dbcon/mysql/ha_view.h | 4 +--- dbcon/mysql/idb_mysql.h | 4 +--- dbcon/mysql/sm.h | 4 +--- dbcon/mysql/versionnumber.h | 4 +--- ddlproc/ddlproc.h | 4 +--- ddlproc/ddlprocessor.h | 4 +--- dmlproc/batchinsertprocessor.h | 4 +--- dmlproc/dmlproc.h | 4 +--- dmlproc/dmlprocessor.h | 4 +--- dmlproc/dmlresultbuffer.h | 4 +--- exemgr/activestatementcounter.h | 4 +--- exemgr/femsghandler.h | 4 +--- oam/oamcpp/liboamcpp.h | 4 +--- oam/oamcpp/oamcache.h | 4 +--- oamapps/columnstoreSupport/mcsSupportUtil.h | 4 +--- primitives/blockcache/blockcacheclient.h | 4 +--- primitives/blockcache/blockrequestprocessor.h | 4 +--- primitives/blockcache/fileblockrequestqueue.h | 4 +--- primitives/blockcache/filebuffer.h | 4 +--- primitives/blockcache/filebuffermgr.h | 4 +--- primitives/blockcache/filerequest.h | 4 +--- primitives/blockcache/fsutils.h | 4 +--- primitives/blockcache/iomanager.h | 4 +--- primitives/blockcache/stats.h | 4 +--- primitives/linux-port/primitiveprocessor.h | 4 +--- primitives/primproc/batchprimitiveprocessor.h | 4 +--- primitives/primproc/bppseeder.h | 4 +--- primitives/primproc/bppsendthread.h | 4 +--- primitives/primproc/columncommand.h | 4 +--- primitives/primproc/command.h | 4 +--- primitives/primproc/dictstep.h | 4 +--- primitives/primproc/filtercommand.h | 4 +--- primitives/primproc/passthrucommand.h | 4 +--- primitives/primproc/pp_logger.h | 4 +--- primitives/primproc/primitiveserver.h | 4 +--- primitives/primproc/primproc.h | 4 +--- primitives/primproc/pseudocc.h | 4 +--- primitives/primproc/rtscommand.h | 4 +--- primitives/primproc/umsocketselector.h | 4 +--- storage-manager/include/messageFormat.h | 4 +--- storage-manager/src/AppendTask.h | 4 +--- storage-manager/src/Cache.h | 4 +--- storage-manager/src/ClientRequestProcessor.h | 4 +--- storage-manager/src/CloudStorage.h | 4 +--- storage-manager/src/Config.h | 4 +--- storage-manager/src/CopyTask.h | 4 +--- storage-manager/src/Downloader.h | 4 +--- storage-manager/src/IOCoordinator.h | 4 +--- storage-manager/src/ListDirectoryTask.h | 4 +--- storage-manager/src/LocalStorage.h | 4 +--- storage-manager/src/MetadataFile.h | 4 +--- storage-manager/src/OpenTask.h | 4 +--- storage-manager/src/Ownership.h | 4 +--- storage-manager/src/PingTask.h | 4 +--- storage-manager/src/PosixTask.h | 4 +--- storage-manager/src/PrefixCache.h | 4 +--- storage-manager/src/ProcessTask.h | 4 +--- storage-manager/src/ReadTask.h | 4 +--- storage-manager/src/Replicator.h | 4 +--- storage-manager/src/S3Storage.h | 4 +--- storage-manager/src/SMLogging.h | 4 +--- storage-manager/src/SessionManager.h | 4 +--- storage-manager/src/StatTask.h | 4 +--- storage-manager/src/SyncTask.h | 4 +--- storage-manager/src/Synchronizer.h | 4 +--- storage-manager/src/ThreadPool.h | 4 +--- storage-manager/src/TruncateTask.h | 4 +--- storage-manager/src/UnlinkTask.h | 4 +--- storage-manager/src/Utilities.h | 4 +--- storage-manager/src/WriteTask.h | 4 +--- tests/col16block.h | 4 +--- tests/col1block.h | 4 +--- tests/col2block.h | 4 +--- tests/col4block.h | 4 +--- tests/col8block.h | 4 +--- tests/col_double_block.h | 4 +--- tests/col_float_block.h | 4 +--- tests/col_neg_double.h | 4 +--- tests/col_neg_float.h | 4 +--- tools/cleartablelock/cleartablelockthread.h | 4 +--- tools/dbbuilder/dbbuilder.h | 4 +--- tools/dbbuilder/systemcatalog.h | 4 +--- tools/dbbuilder/tpchpopulate.h | 4 +--- tools/dbbuilder/tpchschema.h | 4 +--- tools/dbloadxml/inputmgr.h | 4 +--- tools/dmldriver/dmlif.h | 4 +--- tools/dmldriver/tpchrf2.h | 4 +--- tools/qfe/bison-win.h | 4 +--- tools/qfe/cseputils.h | 4 +--- tools/qfe/ddlstmts.h | 4 +--- tools/qfe/parsequery.h | 4 +--- tools/qfe/returnedrows.h | 4 +--- tools/qfe/sendcsep.h | 4 +--- tools/qfe/socketio.h | 4 +--- tools/qfe/socktype.h | 4 +--- tools/rebuildEM/BRM_saves_em_system_tables_blob.h | 4 +--- tools/rebuildEM/rebuildEM.h | 4 +--- utils/batchloader/batchloader.h | 4 +--- utils/cacheutils/cacheutils.h | 4 +--- utils/cloudio/SMComm.h | 4 +--- utils/cloudio/SMDataFile.h | 4 +--- utils/cloudio/SMFileFactory.h | 4 +--- utils/cloudio/SMFileSystem.h | 4 +--- utils/cloudio/SocketPool.h | 4 +--- utils/cloudio/sm_exceptions.h | 4 +--- utils/common/MonitorProcMem.h | 4 +--- utils/common/atomicops.h | 4 +--- utils/common/branchpred.h | 4 +--- utils/common/cgroupconfigurator.h | 4 +--- utils/common/checks.h | 4 +--- utils/common/collation.h | 4 +--- utils/common/columnwidth.h | 4 +--- utils/common/conststring.h | 4 +--- utils/common/fixedallocator.h | 4 +--- utils/common/genericparser.h | 4 +--- utils/common/hasher.h | 4 +--- utils/common/hashfamily.h | 4 +--- utils/common/mariadb_my_sys.h | 4 +--- utils/common/mcs_basic_types.h | 4 +--- utils/common/nullvaluemanip.h | 4 +--- utils/common/pipe.h | 4 +--- utils/common/poolallocator.h | 4 +--- utils/common/robin_hood.h | 4 +--- utils/common/service.h | 4 +--- utils/common/simd_sse.h | 4 +--- utils/common/simpleallocator.h | 4 +--- utils/common/statistics.h | 4 +--- utils/common/stlpoolallocator.h | 4 +--- utils/common/syncstream.h | 4 +--- utils/common/threadnaming.h | 4 +--- utils/common/utils_utf8.h | 4 +--- utils/common/vlarray.h | 4 +--- utils/common/widedecimalutils.h | 4 +--- utils/compress/idbcompress.h | 4 +--- utils/configcpp/configcpp.h | 4 +--- utils/configcpp/configstream.h | 4 +--- utils/configcpp/md5/md5.h | 4 +--- utils/configcpp/writeonce.h | 4 +--- utils/configcpp/xmlparser.h | 4 +--- utils/dataconvert/dataconvert.h | 4 +--- utils/ddlcleanup/ddlcleanuputil.h | 4 +--- utils/funcexp/funcexp.h | 4 +--- utils/funcexp/funcexpwrapper.h | 4 +--- utils/funcexp/funchelpers.h | 4 +--- utils/funcexp/functor.h | 4 +--- utils/funcexp/functor_all.h | 4 +--- utils/funcexp/functor_bool.h | 4 +--- utils/funcexp/functor_dtm.h | 4 +--- utils/funcexp/functor_export.h | 4 +--- utils/funcexp/functor_int.h | 4 +--- utils/funcexp/functor_real.h | 4 +--- utils/funcexp/functor_str.h | 4 +--- utils/funcexp/sha.h | 4 +--- utils/funcexp/sql_crypt.h | 4 +--- utils/funcexp/utf8.h | 4 +--- utils/funcexp/utf8/checked.h | 4 +--- utils/funcexp/utf8/core.h | 4 +--- utils/funcexp/utf8/unchecked.h | 4 +--- utils/idbdatafile/BufferedFile.h | 4 +--- utils/idbdatafile/BufferedFileFactory.h | 4 +--- utils/idbdatafile/FileFactoryBase.h | 4 +--- utils/idbdatafile/IDBDataFile.h | 4 +--- utils/idbdatafile/IDBFactory.h | 4 +--- utils/idbdatafile/IDBFileSystem.h | 4 +--- utils/idbdatafile/IDBLogger.h | 4 +--- utils/idbdatafile/IDBPolicy.h | 4 +--- utils/idbdatafile/PosixFileSystem.h | 4 +--- utils/idbdatafile/UnbufferedFile.h | 4 +--- utils/idbdatafile/UnbufferedFileFactory.h | 4 +--- utils/idbdatafile/largefile64.h | 4 +--- utils/idbdatafile/utility.h | 4 +--- utils/joiner/btree.h | 4 +--- utils/joiner/btree_container.h | 4 +--- utils/joiner/btree_map.h | 4 +--- utils/joiner/btree_set.h | 4 +--- utils/joiner/joiner.h | 4 +--- utils/joiner/joinpartition.h | 4 +--- utils/joiner/tuplejoiner.h | 4 +--- utils/loggingcpp/errorcodes.h | 4 +--- utils/loggingcpp/exceptclasses.h | 4 +--- utils/loggingcpp/idberrorinfo.h | 4 +--- utils/loggingcpp/logger.h | 4 +--- utils/loggingcpp/loggingid.h | 4 +--- utils/loggingcpp/messagelog.h | 4 +--- utils/loggingcpp/messageobj.h | 4 +--- utils/loggingcpp/sqllogger.h | 4 +--- utils/loggingcpp/stopwatch.h | 4 +--- utils/messageqcpp/bytestream.h | 4 +--- utils/messageqcpp/bytestreampool.h | 4 +--- utils/messageqcpp/compressed_iss.h | 4 +--- utils/messageqcpp/inetstreamsocket.h | 4 +--- utils/messageqcpp/iosocket.h | 4 +--- utils/messageqcpp/messagequeue.h | 4 +--- utils/messageqcpp/messagequeuepool.h | 4 +--- utils/messageqcpp/serializeable.h | 4 +--- utils/messageqcpp/serversocket.h | 4 +--- utils/messageqcpp/socket.h | 4 +--- utils/messageqcpp/socketclosed.h | 4 +--- utils/messageqcpp/socketparms.h | 4 +--- utils/multicast/impl.h | 4 +--- utils/multicast/mc_fifo.h | 4 +--- utils/multicast/multicast.h | 4 +--- utils/multicast/participants.h | 4 +--- utils/multicast/produconsum.h | 4 +--- utils/multicast/socklib.h | 4 +--- utils/multicast/statistics.h | 4 +--- utils/multicast/threads.h | 4 +--- utils/multicast/udp-sender.h | 4 +--- utils/multicast/udpc-protoc.h | 4 +--- utils/multicast/udpcast.h | 4 +--- utils/multicast/util.h | 4 +--- utils/querystats/querystats.h | 4 +--- utils/querytele/QueryTeleService.h | 4 +--- utils/querytele/querystepparms.h | 4 +--- utils/querytele/querytele.h | 4 +--- utils/querytele/querytele_constants.h | 4 +--- utils/querytele/querytele_types.h | 4 +--- utils/querytele/queryteleclient.h | 4 +--- utils/querytele/queryteleprotoimpl.h | 4 +--- utils/querytele/queryteleserverparms.h | 4 +--- utils/querytele/telestats.h | 4 +--- utils/regr/corr.h | 4 +--- utils/regr/covar_pop.h | 4 +--- utils/regr/covar_samp.h | 4 +--- utils/regr/moda.h | 4 +--- utils/regr/regr_avgx.h | 4 +--- utils/regr/regr_avgy.h | 4 +--- utils/regr/regr_count.h | 4 +--- utils/regr/regr_intercept.h | 4 +--- utils/regr/regr_r2.h | 4 +--- utils/regr/regr_slope.h | 4 +--- utils/regr/regr_sxx.h | 4 +--- utils/regr/regr_sxy.h | 4 +--- utils/regr/regr_syy.h | 4 +--- utils/rowgroup/rowaggregation.h | 4 +--- utils/rowgroup/rowgroup.h | 4 +--- utils/rowgroup/rowstorage.h | 4 +--- utils/rwlock/rwlock.h | 4 +--- utils/rwlock/rwlock_local.h | 4 +--- utils/startup/installdir.h | 4 +--- utils/testbc/blockcacheclient.h | 4 +--- utils/testbc/blockrequestprocessor.h | 4 +--- utils/testbc/fileblockrequestqueue.h | 4 +--- utils/testbc/filebuffer.h | 4 +--- utils/testbc/filebuffermgr.h | 4 +--- utils/testbc/filerequest.h | 4 +--- utils/testbc/iomanager.h | 4 +--- utils/testbc/logger.h | 4 +--- utils/testbc/stats.h | 4 +--- utils/threadpool/prioritythreadpool.h | 4 +--- utils/threadpool/threadpool.h | 4 +--- utils/threadpool/weightedthreadpool.h | 4 +--- utils/thrift/thrift/TApplicationException.h | 4 +--- utils/thrift/thrift/TDispatchProcessor.h | 4 +--- utils/thrift/thrift/TLogging.h | 4 +--- utils/thrift/thrift/TProcessor.h | 4 +--- utils/thrift/thrift/TReflectionLocal.h | 4 +--- utils/thrift/thrift/Thrift.h | 4 +--- utils/thrift/thrift/async/TAsyncBufferProcessor.h | 4 +--- utils/thrift/thrift/async/TAsyncChannel.h | 4 +--- utils/thrift/thrift/async/TAsyncDispatchProcessor.h | 4 +--- utils/thrift/thrift/async/TAsyncProcessor.h | 4 +--- utils/thrift/thrift/async/TAsyncProtocolProcessor.h | 4 +--- utils/thrift/thrift/async/TEvhttpClientChannel.h | 4 +--- utils/thrift/thrift/async/TEvhttpServer.h | 4 +--- utils/thrift/thrift/concurrency/BoostThreadFactory.h | 4 +--- utils/thrift/thrift/concurrency/Exception.h | 4 +--- utils/thrift/thrift/concurrency/FunctionRunner.h | 4 +--- utils/thrift/thrift/concurrency/Monitor.h | 4 +--- utils/thrift/thrift/concurrency/Mutex.h | 4 +--- utils/thrift/thrift/concurrency/PlatformThreadFactory.h | 4 +--- utils/thrift/thrift/concurrency/PosixThreadFactory.h | 4 +--- utils/thrift/thrift/concurrency/StdThreadFactory.h | 4 +--- utils/thrift/thrift/concurrency/Thread.h | 4 +--- utils/thrift/thrift/concurrency/ThreadManager.h | 4 +--- utils/thrift/thrift/concurrency/TimerManager.h | 4 +--- utils/thrift/thrift/concurrency/Util.h | 4 +--- utils/thrift/thrift/cxxfunctional.h | 4 +--- utils/thrift/thrift/processor/PeekProcessor.h | 4 +--- utils/thrift/thrift/processor/StatsProcessor.h | 4 +--- utils/thrift/thrift/processor/TMultiplexedProcessor.h | 4 +--- utils/thrift/thrift/protocol/TBase64Utils.h | 4 +--- utils/thrift/thrift/protocol/TBinaryProtocol.h | 4 +--- utils/thrift/thrift/protocol/TCompactProtocol.h | 4 +--- utils/thrift/thrift/protocol/TDebugProtocol.h | 4 +--- utils/thrift/thrift/protocol/TDenseProtocol.h | 4 +--- utils/thrift/thrift/protocol/TJSONProtocol.h | 4 +--- utils/thrift/thrift/protocol/TMultiplexedProtocol.h | 4 +--- utils/thrift/thrift/protocol/TProtocol.h | 4 +--- utils/thrift/thrift/protocol/TProtocolDecorator.h | 4 +--- utils/thrift/thrift/protocol/TProtocolException.h | 4 +--- utils/thrift/thrift/protocol/TProtocolTap.h | 4 +--- utils/thrift/thrift/protocol/TVirtualProtocol.h | 4 +--- utils/thrift/thrift/qt/TQIODeviceTransport.h | 4 +--- utils/thrift/thrift/qt/TQTcpServer.h | 4 +--- utils/thrift/thrift/server/TNonblockingServer.h | 4 +--- utils/thrift/thrift/server/TServer.h | 4 +--- utils/thrift/thrift/server/TSimpleServer.h | 4 +--- utils/thrift/thrift/server/TThreadPoolServer.h | 4 +--- utils/thrift/thrift/server/TThreadedServer.h | 4 +--- utils/thrift/thrift/thrift-config.h | 4 +--- utils/thrift/thrift/transport/PlatformSocket.h | 4 +--- utils/thrift/thrift/transport/TBufferTransports.h | 4 +--- utils/thrift/thrift/transport/TFDTransport.h | 4 +--- utils/thrift/thrift/transport/TFileTransport.h | 4 +--- utils/thrift/thrift/transport/THttpClient.h | 4 +--- utils/thrift/thrift/transport/THttpServer.h | 4 +--- utils/thrift/thrift/transport/THttpTransport.h | 4 +--- utils/thrift/thrift/transport/TPipe.h | 4 +--- utils/thrift/thrift/transport/TPipeServer.h | 4 +--- utils/thrift/thrift/transport/TSSLServerSocket.h | 4 +--- utils/thrift/thrift/transport/TSSLSocket.h | 4 +--- utils/thrift/thrift/transport/TServerSocket.h | 4 +--- utils/thrift/thrift/transport/TServerTransport.h | 4 +--- utils/thrift/thrift/transport/TShortReadTransport.h | 4 +--- utils/thrift/thrift/transport/TSimpleFileTransport.h | 4 +--- utils/thrift/thrift/transport/TSocket.h | 4 +--- utils/thrift/thrift/transport/TSocketPool.h | 4 +--- utils/thrift/thrift/transport/TTransport.h | 4 +--- utils/thrift/thrift/transport/TTransportException.h | 4 +--- utils/thrift/thrift/transport/TTransportUtils.h | 4 +--- utils/thrift/thrift/transport/TVirtualTransport.h | 4 +--- utils/thrift/thrift/transport/TZlibTransport.h | 4 +--- utils/thrift/thrift/windows/GetTimeOfDay.h | 4 +--- utils/thrift/thrift/windows/Operators.h | 4 +--- utils/thrift/thrift/windows/SocketPair.h | 4 +--- utils/thrift/thrift/windows/TWinsockSingleton.h | 4 +--- utils/thrift/thrift/windows/WinFcntl.h | 4 +--- utils/udfsdk/allnull.h | 4 +--- utils/udfsdk/avg_mode.h | 4 +--- utils/udfsdk/avgx.h | 4 +--- utils/udfsdk/distinct_count.h | 4 +--- utils/udfsdk/mcsv1_udaf.h | 4 +--- utils/udfsdk/median.h | 4 +--- utils/udfsdk/ssq.h | 4 +--- utils/windowfunction/framebound.h | 4 +--- utils/windowfunction/frameboundrange.h | 4 +--- utils/windowfunction/frameboundrow.h | 4 +--- utils/windowfunction/idborderby.h | 4 +--- utils/windowfunction/wf_count.h | 4 +--- utils/windowfunction/wf_lead_lag.h | 4 +--- utils/windowfunction/wf_min_max.h | 4 +--- utils/windowfunction/wf_nth_value.h | 4 +--- utils/windowfunction/wf_ntile.h | 4 +--- utils/windowfunction/wf_percentile.h | 4 +--- utils/windowfunction/wf_ranking.h | 4 +--- utils/windowfunction/wf_row_number.h | 4 +--- utils/windowfunction/wf_stats.h | 4 +--- utils/windowfunction/wf_sum_avg.h | 4 +--- utils/windowfunction/wf_udaf.h | 4 +--- utils/windowfunction/windowframe.h | 4 +--- utils/windowfunction/windowfunction.h | 4 +--- utils/windowfunction/windowfunctiontype.h | 4 +--- utils/winport/fixup.h | 4 +--- utils/winport/glob.h | 4 +--- utils/winport/grepit.h | 4 +--- utils/winport/idb_getopt.h | 4 +--- utils/winport/idbregistry.h | 4 +--- utils/winport/inttypes.h | 4 +--- utils/winport/poll.h | 4 +--- utils/winport/sedit.h | 4 +--- utils/winport/sysinfo.h | 4 +--- utils/winport/syslog.h | 4 +--- utils/winport/unistd.h | 4 +--- utils/winport/winport.h | 4 +--- versioning/BRM/autoincrementmanager.h | 4 +--- versioning/BRM/blockresolutionmanager.h | 4 +--- versioning/BRM/brmshmimpl.h | 4 +--- versioning/BRM/brmtypes.h | 4 +--- versioning/BRM/copylocks.h | 4 +--- versioning/BRM/dbrm.h | 4 +--- versioning/BRM/extentmap.h | 4 +--- versioning/BRM/lbidresourcegraph.h | 4 +--- versioning/BRM/logicalpartition.h | 4 +--- versioning/BRM/masterdbrmnode.h | 4 +--- versioning/BRM/mastersegmenttable.h | 4 +--- versioning/BRM/oidserver.h | 4 +--- versioning/BRM/resourcenode.h | 4 +--- versioning/BRM/rgnode.h | 4 +--- versioning/BRM/rwlockmonitor.h | 4 +--- versioning/BRM/sessionmanagerserver.h | 4 +--- versioning/BRM/shmkeys.h | 4 +--- versioning/BRM/slavecomm.h | 4 +--- versioning/BRM/slavedbrmnode.h | 4 +--- versioning/BRM/tablelockserver.h | 4 +--- versioning/BRM/tracer.h | 4 +--- versioning/BRM/transactionnode.h | 4 +--- versioning/BRM/undoable.h | 4 +--- versioning/BRM/vbbm.h | 4 +--- versioning/BRM/vss.h | 4 +--- writeengine/bulk/we_brmreporter.h | 4 +--- writeengine/bulk/we_bulkload.h | 4 +--- writeengine/bulk/we_bulkloadbuffer.h | 4 +--- writeengine/bulk/we_bulkstatus.h | 4 +--- writeengine/bulk/we_colbuf.h | 4 +--- writeengine/bulk/we_colbufcompressed.h | 4 +--- writeengine/bulk/we_colbufmgr.h | 4 +--- writeengine/bulk/we_colbufsec.h | 4 +--- writeengine/bulk/we_colextinf.h | 4 +--- writeengine/bulk/we_colopbulk.h | 4 +--- writeengine/bulk/we_columnautoinc.h | 4 +--- writeengine/bulk/we_columninfo.h | 4 +--- writeengine/bulk/we_columninfocompressed.h | 4 +--- writeengine/bulk/we_extentstripealloc.h | 4 +--- writeengine/bulk/we_tableinfo.h | 4 +--- writeengine/bulk/we_tempxmlgendata.h | 4 +--- writeengine/client/we_clients.h | 4 +--- writeengine/client/we_ddlcommandclient.h | 4 +--- writeengine/client/we_dmlcommandclient.h | 4 +--- writeengine/dictionary/we_dctnry.h | 4 +--- writeengine/dictionary/we_dctnrystore.h | 4 +--- writeengine/index/we_freemgr.h | 4 +--- writeengine/index/we_indexlist.h | 4 +--- writeengine/index/we_indextree.h | 4 +--- writeengine/redistribute/we_redistribute.h | 4 +--- writeengine/redistribute/we_redistributecontrol.h | 4 +--- writeengine/redistribute/we_redistributecontrolthread.h | 4 +--- writeengine/redistribute/we_redistributedef.h | 4 +--- writeengine/redistribute/we_redistributeworkerthread.h | 4 +--- writeengine/server/we_brmrprtparser.h | 4 +--- writeengine/server/we_cleartablelockcmd.h | 4 +--- writeengine/server/we_cpifeederthread.h | 4 +--- writeengine/server/we_dataloader.h | 4 +--- writeengine/server/we_ddlcommandproc.h | 4 +--- writeengine/server/we_ddlcommon.h | 4 +--- writeengine/server/we_dmlcommandproc.h | 4 +--- writeengine/server/we_getfilesizes.h | 4 +--- writeengine/server/we_message_handlers.h | 4 +--- writeengine/server/we_messages.h | 4 +--- writeengine/server/we_observer.h | 4 +--- writeengine/server/we_readthread.h | 4 +--- writeengine/shared/we_blockop.h | 4 +--- writeengine/shared/we_brm.h | 4 +--- writeengine/shared/we_bulkrollbackfile.h | 4 +--- writeengine/shared/we_bulkrollbackfilecompressed.h | 4 +--- writeengine/shared/we_bulkrollbackfilecompressedhdfs.h | 4 +--- writeengine/shared/we_bulkrollbackmgr.h | 4 +--- writeengine/shared/we_cache.h | 4 +--- writeengine/shared/we_chunkmanager.h | 4 +--- writeengine/shared/we_config.h | 4 +--- writeengine/shared/we_confirmhdfsdbfile.h | 4 +--- writeengine/shared/we_convertor.h | 4 +--- writeengine/shared/we_dbfileop.h | 4 +--- writeengine/shared/we_dbrootextenttracker.h | 4 +--- writeengine/shared/we_define.h | 4 +--- writeengine/shared/we_fileop.h | 4 +--- writeengine/shared/we_index.h | 4 +--- writeengine/shared/we_log.h | 4 +--- writeengine/shared/we_macro.h | 4 +--- writeengine/shared/we_obj.h | 4 +--- writeengine/shared/we_rbmetawriter.h | 4 +--- writeengine/shared/we_simplesyslog.h | 4 +--- writeengine/shared/we_stats.h | 4 +--- writeengine/shared/we_type.h | 4 +--- writeengine/shared/we_typeext.h | 4 +--- writeengine/splitter/we_brmupdater.h | 4 +--- writeengine/splitter/we_cmdargs.h | 4 +--- writeengine/splitter/we_filereadthread.h | 4 +--- writeengine/splitter/we_respreadthread.h | 4 +--- writeengine/splitter/we_sdhandler.h | 4 +--- writeengine/splitter/we_splclient.h | 4 +--- writeengine/splitter/we_splitterapp.h | 4 +--- writeengine/splitter/we_tablelockgrabber.h | 4 +--- writeengine/splitter/we_xmlgetter.h | 4 +--- writeengine/wrapper/we_colop.h | 4 +--- writeengine/wrapper/we_colopcompress.h | 4 +--- writeengine/wrapper/we_dctnrycompress.h | 4 +--- writeengine/wrapper/we_tablemetadata.h | 4 +--- writeengine/wrapper/writeengine.h | 4 +--- writeengine/xml/we_xmlgendata.h | 4 +--- writeengine/xml/we_xmlgenproc.h | 4 +--- writeengine/xml/we_xmljob.h | 4 +--- writeengine/xml/we_xmlop.h | 4 +--- writeengine/xml/we_xmltag.h | 4 +--- 638 files changed, 638 insertions(+), 1914 deletions(-) diff --git a/datatypes/mcs_data_condition.h b/datatypes/mcs_data_condition.h index 597daf911..0c12042c5 100644 --- a/datatypes/mcs_data_condition.h +++ b/datatypes/mcs_data_condition.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef MCS_DATA_CONDITION_H -#define MCS_DATA_CONDITION_H +#pragma once namespace datatypes { @@ -80,4 +79,3 @@ private: } // namespace datatypes -#endif // MCS_DATA_CONDITION_H diff --git a/datatypes/mcs_datatype.h b/datatypes/mcs_datatype.h index fbaa47e05..191bb9938 100644 --- a/datatypes/mcs_datatype.h +++ b/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 -#define MCS_DATATYPE_H_INCLUDED +#pragma once #include #include @@ -2883,6 +2882,5 @@ class TypeHandlerTimestamp: public TypeHandlerTemporal }// end of namespace datatypes -#endif //MCS_DATATYPE_H_INCLUDED // vim:ts=2 sw=2: diff --git a/datatypes/mcs_datatype_basic.h b/datatypes/mcs_datatype_basic.h index 9450692f3..a5b4bcd00 100644 --- a/datatypes/mcs_datatype_basic.h +++ b/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 -#define MCS_DATATYPE_BASIC_H_INCLUDED +#pragma once /* 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: diff --git a/datatypes/mcs_decimal.h b/datatypes/mcs_decimal.h index 1c5216d19..0c28e250b 100644 --- a/datatypes/mcs_decimal.h +++ b/datatypes/mcs_decimal.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef H_DECIMALDATATYPE -#define H_DECIMALDATATYPE +#pragma once #include #include @@ -983,4 +982,3 @@ struct NoOverflowCheck { }; } //end of namespace -#endif diff --git a/datatypes/mcs_double.h b/datatypes/mcs_double.h index 04bfbf3c9..c6ebacd17 100644 --- a/datatypes/mcs_double.h +++ b/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 -#define MCS_DOUBLE_H_INCLUDED +#pragma once #include "mcs_datatype_basic.h" @@ -52,5 +51,4 @@ public: } //end of namespace datatypes -#endif // MCS_DOUBLE_H_INCLUDED // vim:ts=2 sw=2: diff --git a/datatypes/mcs_float128.h b/datatypes/mcs_float128.h index 068d9205c..86feb0725 100644 --- a/datatypes/mcs_float128.h +++ b/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 -#define MCS_TSFLOAT128_H_INCLUDED +#pragma once #include #include @@ -631,6 +630,5 @@ class TFloat128 } //end of namespace -#endif // MCS_TSFLOAT128_H_INCLUDED // vim:ts=2 sw=2: diff --git a/datatypes/mcs_int128.h b/datatypes/mcs_int128.h index 4a23033c0..ba72eb955 100644 --- a/datatypes/mcs_int128.h +++ b/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 -#define MCS_INT128_H_INCLUDED +#pragma once #include #include @@ -345,5 +344,4 @@ class TSInt128 } //end of namespace datatypes -#endif // MCS_TSINT128_H_INCLUDED // vim:ts=2 sw=2: diff --git a/datatypes/mcs_int64.h b/datatypes/mcs_int64.h index 431a7315c..84b5f133a 100644 --- a/datatypes/mcs_int64.h +++ b/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 -#define MCS_INT64_H_INCLUDED +#pragma once #include "exceptclasses.h" @@ -173,5 +172,4 @@ public: } //end of namespace datatypes -#endif // MCS_INT64_H_INCLUDED // vim:ts=2 sw=2: diff --git a/datatypes/mcs_longdouble.h b/datatypes/mcs_longdouble.h index 60caa3982..8bf024e2e 100644 --- a/datatypes/mcs_longdouble.h +++ b/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 -#define MCS_LONGDOUBLE_H_INCLUDED +#pragma once #include "mcs_datatype_basic.h" @@ -52,5 +51,4 @@ public: } //end of namespace datatypes -#endif // MCS_LONGDOUBLE_H_INCLUDED // vim:ts=2 sw=2: diff --git a/datatypes/mcs_numeric_limits.h b/datatypes/mcs_numeric_limits.h index 48fe545db..a59acdc0b 100644 --- a/datatypes/mcs_numeric_limits.h +++ b/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 -#define MCS_NUMERIC_LIMITS_H_INCLUDED +#pragma once #include @@ -59,4 +58,3 @@ template<> struct numeric_limits } // namespace datatypes -#endif // MCS_NUMERIC_LIMITS_H_INCLUDED diff --git a/datatypes/mcs_string.h b/datatypes/mcs_string.h index 15720cedb..e9d5bf4d9 100644 --- a/datatypes/mcs_string.h +++ b/datatypes/mcs_string.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef MCS_DATATYPES_STRING_H -#define MCS_DATATYPES_STRING_H +#pragma once #include "conststring.h" #include "collation.h" // class Charset @@ -50,4 +49,3 @@ public: } // namespace datatypes -#endif // MCS_DATATYPES_STRING_H diff --git a/datatypes/numericliteral.h b/datatypes/numericliteral.h index 2aeb58ab3..2c9c57c84 100644 --- a/datatypes/numericliteral.h +++ b/datatypes/numericliteral.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef NUMERICLITERAL_H -#define NUMERICLITERAL_H +#pragma once #include "genericparser.h" #include "mcs_datatype.h" @@ -617,4 +616,3 @@ public: } // namespace literal -#endif // NUMERICLITERAL_H diff --git a/dbcon/ddlpackage/ddl-gram-win.h b/dbcon/ddlpackage/ddl-gram-win.h index adcb6ca30..0422ecd29 100644 --- a/dbcon/ddlpackage/ddl-gram-win.h +++ b/dbcon/ddlpackage/ddl-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 @@ -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; diff --git a/dbcon/ddlpackage/ddlpkg.h b/dbcon/ddlpackage/ddlpkg.h index 83dfa57fe..2bc8d3885 100644 --- a/dbcon/ddlpackage/ddlpkg.h +++ b/dbcon/ddlpackage/ddlpkg.h @@ -35,8 +35,7 @@ * */ -#ifndef DDLPACKAGE_H -#define DDLPACKAGE_H +#pragma once #include #include @@ -1651,4 +1650,3 @@ struct DropPartitionStatement : public SqlStatement #undef EXPORT -#endif diff --git a/dbcon/ddlpackageproc/altertableprocessor.h b/dbcon/ddlpackageproc/altertableprocessor.h index 645b003d0..da8567639 100644 --- a/dbcon/ddlpackageproc/altertableprocessor.h +++ b/dbcon/ddlpackageproc/altertableprocessor.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef ALTERTABLEPROCESSOR_H -#define ALTERTABLEPROCESSOR_H +#pragma once #include "ddlpackageprocessor.h" @@ -159,4 +158,3 @@ private: #undef EXPORT -#endif //ALTERTABLEPROCESSOR_H diff --git a/dbcon/ddlpackageproc/createindexprocessor.h b/dbcon/ddlpackageproc/createindexprocessor.h index a09290556..e5886ce37 100644 --- a/dbcon/ddlpackageproc/createindexprocessor.h +++ b/dbcon/ddlpackageproc/createindexprocessor.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef CREATEINDEXPROCESSOR_H -#define CREATEINDEXPROCESSOR_H +#pragma once #include "ddlpackageprocessor.h" #include "ddlpkg.h" @@ -51,4 +50,3 @@ private: }; } //namespace ddlpackageprocessor -#endif //CREATEINDEXPROCESSOR_H diff --git a/dbcon/ddlpackageproc/createtableprocessor.h b/dbcon/ddlpackageproc/createtableprocessor.h index 3a601efb7..3997d4869 100644 --- a/dbcon/ddlpackageproc/createtableprocessor.h +++ b/dbcon/ddlpackageproc/createtableprocessor.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef CREATETABLEPROCESSOR_H -#define CREATETABLEPROCESSOR_H +#pragma once #include "ddlpackageprocessor.h" @@ -61,4 +60,3 @@ private: #undef EXPORT -#endif // CREATETABLEPROCESSOR_H diff --git a/dbcon/ddlpackageproc/ddlpackageprocessor.h b/dbcon/ddlpackageproc/ddlpackageprocessor.h index 84d50d805..9806a2bf3 100644 --- a/dbcon/ddlpackageproc/ddlpackageprocessor.h +++ b/dbcon/ddlpackageproc/ddlpackageprocessor.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef DDLPACKAGEPROCESSOR_H -#define DDLPACKAGEPROCESSOR_H +#pragma once #include #include #include @@ -879,6 +878,5 @@ bool from_string(T& t, #undef EXPORT -#endif //DDLPACKAGEPROCESSOR_H // vim:ts=4 sw=4: diff --git a/dbcon/ddlpackageproc/ddlpackageprocessorfactory.h b/dbcon/ddlpackageproc/ddlpackageprocessorfactory.h index dfdc995d8..39b9407a5 100644 --- a/dbcon/ddlpackageproc/ddlpackageprocessorfactory.h +++ b/dbcon/ddlpackageproc/ddlpackageprocessorfactory.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef DDLPACKAGEPROCESSORFACTORY_H -#define DDLPACKAGEPROCESSORFACTORY_H +#pragma once #include #include "ddlpkg.h" #include "ddlpackageprocessor.h" @@ -53,5 +52,4 @@ private: }; } -#endif //DDLPACKAGEPROCESSORFACTORY_H diff --git a/dbcon/ddlpackageproc/dropindexprocessor.h b/dbcon/ddlpackageproc/dropindexprocessor.h index 34a17de21..0ea823d82 100644 --- a/dbcon/ddlpackageproc/dropindexprocessor.h +++ b/dbcon/ddlpackageproc/dropindexprocessor.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef DROPINDEXPROCESSOR_H -#define DROPINDEXPROCESSOR_H +#pragma once #include "ddlpackageprocessor.h" @@ -48,4 +47,3 @@ private: }; } //namespace ddlpackageprocessor -#endif //DROPINDEXPROCESSOR_H diff --git a/dbcon/ddlpackageproc/droppartitionprocessor.h b/dbcon/ddlpackageproc/droppartitionprocessor.h index 96747d022..045490eb5 100644 --- a/dbcon/ddlpackageproc/droppartitionprocessor.h +++ b/dbcon/ddlpackageproc/droppartitionprocessor.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef DROPPARTITIONEPROCESSOR_H -#define DROPPARTITIONEPROCESSOR_H +#pragma once #include "ddlpackageprocessor.h" @@ -57,4 +56,3 @@ private: #undef EXPORT -#endif //DROPPARTITIONEPROCESSOR_H diff --git a/dbcon/ddlpackageproc/droptableprocessor.h b/dbcon/ddlpackageproc/droptableprocessor.h index 4b7a3369b..84ea5ef35 100644 --- a/dbcon/ddlpackageproc/droptableprocessor.h +++ b/dbcon/ddlpackageproc/droptableprocessor.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef DROPTABLEPROCESSOR_H -#define DROPTABLEPROCESSOR_H +#pragma once #include "ddlpackageprocessor.h" @@ -78,4 +77,3 @@ private: #undef EXPORT -#endif //DROPTABLEPROCESSOR_H diff --git a/dbcon/ddlpackageproc/markpartitionprocessor.h b/dbcon/ddlpackageproc/markpartitionprocessor.h index 411bf45b3..f95232b1c 100644 --- a/dbcon/ddlpackageproc/markpartitionprocessor.h +++ b/dbcon/ddlpackageproc/markpartitionprocessor.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef MARKPARTITIONPROCESSOR_H -#define MARKPARTITIONPROCESSOR_H +#pragma once #include "ddlpackageprocessor.h" @@ -60,4 +59,3 @@ private: #undef EXPORT -#endif // MARKPARTITIONPROCESSOR_H diff --git a/dbcon/ddlpackageproc/restorepartitionprocessor.h b/dbcon/ddlpackageproc/restorepartitionprocessor.h index a61849836..f984bfaa5 100644 --- a/dbcon/ddlpackageproc/restorepartitionprocessor.h +++ b/dbcon/ddlpackageproc/restorepartitionprocessor.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef RESTOREPARTITIONEPROCESSOR_H -#define RESTOREPARTITIONEPROCESSOR_H +#pragma once #include "ddlpackageprocessor.h" @@ -57,4 +56,3 @@ private: #undef EXPORT -#endif //RESTOREPARTITIONEPROCESSOR_H diff --git a/dbcon/dmlpackage/calpontdmlfactory.h b/dbcon/dmlpackage/calpontdmlfactory.h index 78a5bb76f..5b9226e67 100644 --- a/dbcon/dmlpackage/calpontdmlfactory.h +++ b/dbcon/dmlpackage/calpontdmlfactory.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef CALPONTDMLFACTORY_H -#define CALPONTDMLFACTORY_H +#pragma once #include #include "dmlpackage.h" #include "calpontdmlpackage.h" @@ -72,4 +71,3 @@ private: #undef EXPORT -#endif //CALPONTDMLFACTORY_H diff --git a/dbcon/dmlpackage/calpontdmlpackage.h b/dbcon/dmlpackage/calpontdmlpackage.h index af25e2524..5e8a5e312 100644 --- a/dbcon/dmlpackage/calpontdmlpackage.h +++ b/dbcon/dmlpackage/calpontdmlpackage.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef CALPONTDMLPACKAGE_H -#define CALPONTDMLPACKAGE_H +#pragma once #include #include @@ -394,4 +393,3 @@ protected: WriteEngine::ChunkManager* fCM; }; } -#endif //CALPONTDMLPACKAGE_H diff --git a/dbcon/dmlpackage/commanddmlpackage.h b/dbcon/dmlpackage/commanddmlpackage.h index 2ddcdde29..0aa71d501 100644 --- a/dbcon/dmlpackage/commanddmlpackage.h +++ b/dbcon/dmlpackage/commanddmlpackage.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef COMMANDDMLPACKAGE_H -#define COMMANDDMLPACKAGE_H +#pragma once #include #include "calpontdmlpackage.h" #include "bytestream.h" @@ -101,4 +100,3 @@ private: #undef EXPORT -#endif //COMMANDDMLPACKAGE_H diff --git a/dbcon/dmlpackage/deletedmlpackage.h b/dbcon/dmlpackage/deletedmlpackage.h index 562b73931..ccb8a6d87 100644 --- a/dbcon/dmlpackage/deletedmlpackage.h +++ b/dbcon/dmlpackage/deletedmlpackage.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef DELETEDMLPACKAGE_H -#define DELETEDMLPACKAGE_H +#pragma once #include #include "calpontdmlpackage.h" #include "bytestream.h" @@ -103,4 +102,3 @@ private: #undef EXPORT -#endif //DELETEDMLPACKAGE_H diff --git a/dbcon/dmlpackage/dml-gram-win.h b/dbcon/dmlpackage/dml-gram-win.h index 457adfe1d..c814a365d 100644 --- a/dbcon/dmlpackage/dml-gram-win.h +++ b/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; diff --git a/dbcon/dmlpackage/dmlcolumn.h b/dbcon/dmlpackage/dmlcolumn.h index ffed035ae..e72d20eb9 100644 --- a/dbcon/dmlpackage/dmlcolumn.h +++ b/dbcon/dmlpackage/dmlcolumn.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef DMLCOLUMN_H -#define DMLCOLUMN_H +#pragma once #include #include #include "dmlobject.h" @@ -167,5 +166,4 @@ typedef std::vectorColumnList; #undef EXPORT -#endif //DMLCOLUMN_H diff --git a/dbcon/dmlpackage/dmlobject.h b/dbcon/dmlpackage/dmlobject.h index 929389b89..e25d20328 100644 --- a/dbcon/dmlpackage/dmlobject.h +++ b/dbcon/dmlpackage/dmlobject.h @@ -23,8 +23,7 @@ /** @file */ -#ifndef DMLOBJECT_H -#define DMLOBJECT_H +#pragma once #include #include"bytestream.h" @@ -67,6 +66,5 @@ private: }; } -#endif //DMLOBJECT_H diff --git a/dbcon/dmlpackage/dmlpackage.h b/dbcon/dmlpackage/dmlpackage.h index cafc6776c..685f84809 100644 --- a/dbcon/dmlpackage/dmlpackage.h +++ b/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 diff --git a/dbcon/dmlpackage/dmlparser.h b/dbcon/dmlpackage/dmlparser.h index 2587b015e..6e2b49fd6 100644 --- a/dbcon/dmlpackage/dmlparser.h +++ b/dbcon/dmlpackage/dmlparser.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef DMLPARSER_H -#define DMLPARSER_H +#pragma once #include #include "dmlpkg.h" @@ -117,4 +116,3 @@ private: }; } -#endif // DMLPARSER_H diff --git a/dbcon/dmlpackage/dmlpkg.h b/dbcon/dmlpackage/dmlpkg.h index f7377f8a3..1f116a8b9 100644 --- a/dbcon/dmlpackage/dmlpkg.h +++ b/dbcon/dmlpackage/dmlpkg.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef DMLPKG_H -#define DMLPKG_H +#pragma once #include #include @@ -1048,4 +1047,3 @@ public: }; } // namespace dmlpackage -#endif // DMLPKG_H diff --git a/dbcon/dmlpackage/dmltable.h b/dbcon/dmlpackage/dmltable.h index 8847318f4..3fe7c7bf1 100644 --- a/dbcon/dmlpackage/dmltable.h +++ b/dbcon/dmlpackage/dmltable.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef DMLTABLE_H -#define DMLTABLE_H +#pragma once #include #include @@ -125,5 +124,4 @@ private: } // namespace dmlpackage -#endif //DMLTABLE_H diff --git a/dbcon/dmlpackage/insertdmlpackage.h b/dbcon/dmlpackage/insertdmlpackage.h index a2b76d8fd..55e9254a7 100644 --- a/dbcon/dmlpackage/insertdmlpackage.h +++ b/dbcon/dmlpackage/insertdmlpackage.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef INSERTDMLPACKAGE_H -#define INSERTDMLPACKAGE_H +#pragma once #include #include "calpontdmlpackage.h" #include "bytestream.h" @@ -122,4 +121,3 @@ private: #undef EXPORT -#endif //INSERTDMLPACKAGE_H diff --git a/dbcon/dmlpackage/mysqldmlstatement.h b/dbcon/dmlpackage/mysqldmlstatement.h index 76340798b..00dcba5dd 100644 --- a/dbcon/dmlpackage/mysqldmlstatement.h +++ b/dbcon/dmlpackage/mysqldmlstatement.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef MYSQLDMLSTATEMENT_H -#define MYSQLDMLSTATEMENT_H +#pragma once #include #include "vendordmlstatement.h" @@ -43,5 +42,4 @@ private: }; } -#endif //MYSQLDMLSTATEMENT_H diff --git a/dbcon/dmlpackage/oracledmlstatement.h b/dbcon/dmlpackage/oracledmlstatement.h index e5bc248e3..c87d49e15 100644 --- a/dbcon/dmlpackage/oracledmlstatement.h +++ b/dbcon/dmlpackage/oracledmlstatement.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef ORACLEDMLSTATEMENT_H -#define ORACLEDMLSTATEMENT_H +#pragma once #include #include "vendordmlstatement.h" @@ -44,5 +43,4 @@ private: }; } -#endif //ORACLEDMLSTATEMENT_H diff --git a/dbcon/dmlpackage/row.h b/dbcon/dmlpackage/row.h index 43c9a99aa..8cd5d35f4 100644 --- a/dbcon/dmlpackage/row.h +++ b/dbcon/dmlpackage/row.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef ROW_H -#define ROW_H +#pragma once #include #include "dmlobject.h" #include "bytestream.h" @@ -119,5 +118,4 @@ typedef std::vectorRowList; #undef EXPORT -#endif //ROW_H diff --git a/dbcon/dmlpackage/updatedmlpackage.h b/dbcon/dmlpackage/updatedmlpackage.h index f5aac0097..c053f9f00 100644 --- a/dbcon/dmlpackage/updatedmlpackage.h +++ b/dbcon/dmlpackage/updatedmlpackage.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef UPDATEDMLPACKAGE_H -#define UPDATEDMLPACKAGE_H +#pragma once #include #include "calpontdmlpackage.h" #include "bytestream.h" @@ -105,4 +104,3 @@ private: #undef EXPORT -#endif //UPDATEDMLPACKAGE_H diff --git a/dbcon/dmlpackage/vendordmlstatement.h b/dbcon/dmlpackage/vendordmlstatement.h index 4b9dd4b71..74b63c4ba 100644 --- a/dbcon/dmlpackage/vendordmlstatement.h +++ b/dbcon/dmlpackage/vendordmlstatement.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef VENDORDMLSTATEMENT_H -#define VENDORDMLSTATEMENT_H +#pragma once #include #include #include @@ -250,4 +249,3 @@ private: #undef EXPORT -#endif //VENDORDMLSTATEMENT_H diff --git a/dbcon/dmlpackageproc/autoincrementdata.h b/dbcon/dmlpackageproc/autoincrementdata.h index d3e68b344..17ba8ff11 100644 --- a/dbcon/dmlpackageproc/autoincrementdata.h +++ b/dbcon/dmlpackageproc/autoincrementdata.h @@ -19,8 +19,7 @@ /** @file */ -#ifndef AUTOINCREMENTDATA_H__ -#define AUTOINCREMENTDATA_H__ +#pragma once #include @@ -51,5 +50,4 @@ private: boost::mutex fOIDnextvalLock; }; -#endif // vim:ts=4 sw=4: diff --git a/dbcon/dmlpackageproc/commandpackageprocessor.h b/dbcon/dmlpackageproc/commandpackageprocessor.h index b0180051f..fdec03729 100644 --- a/dbcon/dmlpackageproc/commandpackageprocessor.h +++ b/dbcon/dmlpackageproc/commandpackageprocessor.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef COMMANDPACKAGEPROCESSOR_H -#define COMMANDPACKAGEPROCESSOR_H +#pragma once #include #include #include @@ -77,5 +76,4 @@ private: #undef EXPORT -#endif //COMMANDPACKAGEPROCESSOR_H diff --git a/dbcon/dmlpackageproc/deletepackageprocessor.h b/dbcon/dmlpackageproc/deletepackageprocessor.h index 392cfa2ec..0e4642b84 100644 --- a/dbcon/dmlpackageproc/deletepackageprocessor.h +++ b/dbcon/dmlpackageproc/deletepackageprocessor.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef DELETEPACKAGEPROCESSOR_H -#define DELETEPACKAGEPROCESSOR_H +#pragma once #include #include #include @@ -90,4 +89,3 @@ private: #undef EXPORT -#endif // DELETEPACKAGEPROCESSOR_H diff --git a/dbcon/dmlpackageproc/dmlpackageprocessor.h b/dbcon/dmlpackageproc/dmlpackageprocessor.h index 05c428781..1d63cc4d1 100644 --- a/dbcon/dmlpackageproc/dmlpackageprocessor.h +++ b/dbcon/dmlpackageproc/dmlpackageprocessor.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef DMLPACKAGEPROCESSOR_H -#define DMLPACKAGEPROCESSOR_H +#pragma once #include #include #include @@ -551,4 +550,3 @@ bool from_string(T& t, #undef EXPORT -#endif //DMLPACKAGEPROCESSOR_H diff --git a/dbcon/dmlpackageproc/dmlpackageprocessorfactory.h b/dbcon/dmlpackageproc/dmlpackageprocessorfactory.h index 3c46fde65..0ae84c630 100644 --- a/dbcon/dmlpackageproc/dmlpackageprocessorfactory.h +++ b/dbcon/dmlpackageproc/dmlpackageprocessorfactory.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef DMLPACKAGEPROCESSORFACTORY_H -#define DMLPACKAGEPROCESSORFACTORY_H +#pragma once #include #include "calpontdmlpackage.h" #include "dmlpackageprocessor.h" @@ -62,5 +61,4 @@ private: #undef EXPORT -#endif //DMLPACKAGEPROCESSORFACTORY_H diff --git a/dbcon/dmlpackageproc/insertpackageprocessor.h b/dbcon/dmlpackageproc/insertpackageprocessor.h index 75458fffb..8fb842ab6 100644 --- a/dbcon/dmlpackageproc/insertpackageprocessor.h +++ b/dbcon/dmlpackageproc/insertpackageprocessor.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef INSERTPACKAGEPROCESSOR_H -#define INSERTPACKAGEPROCESSOR_H +#pragma once #include #include #include @@ -67,5 +66,4 @@ private: #undef EXPORT -#endif //INSERTPACKAGEPROCESSOR_H diff --git a/dbcon/dmlpackageproc/tablelockdata.h b/dbcon/dmlpackageproc/tablelockdata.h index 29a0fbb1d..b88e723bb 100644 --- a/dbcon/dmlpackageproc/tablelockdata.h +++ b/dbcon/dmlpackageproc/tablelockdata.h @@ -19,8 +19,7 @@ /** @file */ -#ifndef TABLELOCKDATA_H__ -#define TABLELOCKDATA_H__ +#pragma once #include @@ -63,6 +62,5 @@ private: #undef EXPORT -#endif // vim:ts=4 sw=4: diff --git a/dbcon/dmlpackageproc/updatepackageprocessor.h b/dbcon/dmlpackageproc/updatepackageprocessor.h index 178472173..ac3d6df3f 100644 --- a/dbcon/dmlpackageproc/updatepackageprocessor.h +++ b/dbcon/dmlpackageproc/updatepackageprocessor.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef UPDATEPACKAGEPROCESSOR_H -#define UPDATEPACKAGEPROCESSOR_H +#pragma once #include #include "dmlpackageprocessor.h" #include "dataconvert.h" @@ -80,4 +79,3 @@ private: #undef EXPORT -#endif //UPDATEPACKAGEPROCESSOR_H diff --git a/dbcon/doc/calpontsystemcatalog.h b/dbcon/doc/calpontsystemcatalog.h index a3243e7bf..25db980bd 100644 --- a/dbcon/doc/calpontsystemcatalog.h +++ b/dbcon/doc/calpontsystemcatalog.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef DBCON_CALPONTSYSTEMCATALOG_H -#define DBCON_CALPONTSYSTEMCATALOG_H +#pragma once namespace dbcon { @@ -54,5 +53,4 @@ public: } //namespace dbcon -#endif //DBCON_CALPONTSYSTEMCATALOG_H diff --git a/dbcon/execplan/aggregatecolumn.h b/dbcon/execplan/aggregatecolumn.h index cea23c259..821b7a6bd 100644 --- a/dbcon/execplan/aggregatecolumn.h +++ b/dbcon/execplan/aggregatecolumn.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef AGGREGATECOLUMN_H -#define AGGREGATECOLUMN_H +#pragma once #include #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 diff --git a/dbcon/execplan/arithmeticcolumn.h b/dbcon/execplan/arithmeticcolumn.h index 5aeb6f435..33e96d893 100644 --- a/dbcon/execplan/arithmeticcolumn.h +++ b/dbcon/execplan/arithmeticcolumn.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef ARITHMETICCOLUMN_H -#define ARITHMETICCOLUMN_H +#pragma once #include #include #include @@ -283,5 +282,4 @@ private: std::ostream& operator<<(std::ostream& output, const ArithmeticColumn& rhs); } -#endif //ARITHMETICCOLUMN_H diff --git a/dbcon/execplan/arithmeticoperator.h b/dbcon/execplan/arithmeticoperator.h index 163151f7a..4b3093e63 100644 --- a/dbcon/execplan/arithmeticoperator.h +++ b/dbcon/execplan/arithmeticoperator.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef ARITHMETICOPERATOR_H -#define ARITHMETICOPERATOR_H +#pragma once #include #include #include @@ -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 diff --git a/dbcon/execplan/blocksize.h b/dbcon/execplan/blocksize.h index f61cee5c4..7bd4da858 100644 --- a/dbcon/execplan/blocksize.h +++ b/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 @@ -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 diff --git a/dbcon/execplan/calpontexecutionplan.h b/dbcon/execplan/calpontexecutionplan.h index 213962ef4..0b75a6bdf 100644 --- a/dbcon/execplan/calpontexecutionplan.h +++ b/dbcon/execplan/calpontexecutionplan.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef CALPONTEXECUTIONPLAN_H -#define CALPONTEXECUTIONPLAN_H +#pragma once #include #include @@ -162,5 +161,4 @@ private: typedef boost::shared_ptr SCEP; } -#endif //CALPONTEXECUTIONPLAN_H diff --git a/dbcon/execplan/calpontexecutionplanfactory.h b/dbcon/execplan/calpontexecutionplanfactory.h index d255ca24b..cad79fc4e 100644 --- a/dbcon/execplan/calpontexecutionplanfactory.h +++ b/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 diff --git a/dbcon/execplan/calpontselectexecutionplan.h b/dbcon/execplan/calpontselectexecutionplan.h index 403ec3d8f..69fabb9e7 100644 --- a/dbcon/execplan/calpontselectexecutionplan.h +++ b/dbcon/execplan/calpontselectexecutionplan.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef CALPONTSELECTEXECUTIONPLAN_H -#define CALPONTSELECTEXECUTIONPLAN_H +#pragma once #include #include #include @@ -942,6 +941,5 @@ inline std::ostream& operator<<(std::ostream& os, const CalpontSelectExecutionPl } } -#endif //CALPONTSELECTEXECUTIONPLAN_H // vim:ts=4 sw=4: diff --git a/dbcon/execplan/calpontsystemcatalog.h b/dbcon/execplan/calpontsystemcatalog.h index 8f64b90cb..23fee3320 100644 --- a/dbcon/execplan/calpontsystemcatalog.h +++ b/dbcon/execplan/calpontsystemcatalog.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef EXECPLAN_CALPONTSYSTEMCATALOG_H -#define EXECPLAN_CALPONTSYSTEMCATALOG_H +#pragma once #include #include @@ -1227,6 +1226,5 @@ bool ctListSort(const CalpontSystemCatalog::ColType& a, const CalpontSystemCatal } //namespace execplan -#endif //EXECPLAN_CALPONTSYSTEMCATALOG_H // vim:ts=4 sw=4: diff --git a/dbcon/execplan/clientrotator.h b/dbcon/execplan/clientrotator.h index 051605bb1..076fc5b69 100644 --- a/dbcon/execplan/clientrotator.h +++ b/dbcon/execplan/clientrotator.h @@ -23,8 +23,7 @@ /** @file */ -#ifndef CLIENTROTATOR_H -#define CLIENTROTATOR_H +#pragma once #include #include @@ -170,6 +169,5 @@ private: } // namespace -#endif // vim:ts=4 sw=4: diff --git a/dbcon/execplan/columnresult.h b/dbcon/execplan/columnresult.h index 9fa105836..1d25f1ca0 100644 --- a/dbcon/execplan/columnresult.h +++ b/dbcon/execplan/columnresult.h @@ -21,8 +21,7 @@ *****************************************************************************/ /** @file */ -#ifndef EXECPLAN_COLUMNRESULT_H_ -#define EXECPLAN_COLUMNRESULT_H_ +#pragma once #include #include @@ -114,4 +113,3 @@ private: } -#endif diff --git a/dbcon/execplan/constantcolumn.h b/dbcon/execplan/constantcolumn.h index 33a02fdd2..4fde8c73a 100644 --- a/dbcon/execplan/constantcolumn.h +++ b/dbcon/execplan/constantcolumn.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef CONSTANTCOLUMN_H -#define CONSTANTCOLUMN_H +#pragma once #include #include "returnedcolumn.h" @@ -458,5 +457,4 @@ public: std::ostream& operator<<(std::ostream& output, const ConstantColumn& rhs); } -#endif //CONSTANTCOLUMN_H diff --git a/dbcon/execplan/constantfilter.h b/dbcon/execplan/constantfilter.h index b0cdaf4cb..a8c0b93e7 100644 --- a/dbcon/execplan/constantfilter.h +++ b/dbcon/execplan/constantfilter.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef CONSTANTFILTER_H -#define CONSTANTFILTER_H +#pragma once #include #include #include @@ -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 diff --git a/dbcon/execplan/existsfilter.h b/dbcon/execplan/existsfilter.h index 1a907a32b..b6d4a14f3 100644 --- a/dbcon/execplan/existsfilter.h +++ b/dbcon/execplan/existsfilter.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef EXISTSFILTER_H -#define EXISTSFILTER_H +#pragma once #include #include "filter.h" @@ -146,5 +145,4 @@ private: std::ostream& operator<<(std::ostream& output, const ExistsFilter& rhs); } -#endif //EXISTSFILTER_H diff --git a/dbcon/execplan/exp_templates.h b/dbcon/execplan/exp_templates.h index ebc935146..57d099fd1 100644 --- a/dbcon/execplan/exp_templates.h +++ b/dbcon/execplan/exp_templates.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef EXP_TEMPLATES -#define EXP_TEMPLATES +#pragma once #include #include @@ -672,5 +671,4 @@ private: #undef EXP_TEMPLATE } -#endif diff --git a/dbcon/execplan/expressionparser.h b/dbcon/execplan/expressionparser.h index cc7f34f7b..61940afb7 100644 --- a/dbcon/execplan/expressionparser.h +++ b/dbcon/execplan/expressionparser.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef EXPRESSION_PARSER -#define EXPRESSION_PARSER +#pragma once #include #include @@ -158,4 +157,3 @@ bool operator!=(const ParseTree& t1, } // namespace execplan -#endif diff --git a/dbcon/execplan/filter.h b/dbcon/execplan/filter.h index 4e376f2ba..ddca9253f 100644 --- a/dbcon/execplan/filter.h +++ b/dbcon/execplan/filter.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef EXECPLAN_FILTER_H -#define EXECPLAN_FILTER_H +#pragma once #include #include @@ -165,5 +164,4 @@ private: std::ostream& operator<<(std::ostream& os, const Filter& rhs); } -#endif //EXECPLAN_FILTER_H diff --git a/dbcon/execplan/functioncolumn.h b/dbcon/execplan/functioncolumn.h index d5f5b65bb..7b0d9062b 100644 --- a/dbcon/execplan/functioncolumn.h +++ b/dbcon/execplan/functioncolumn.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef FUNCTIONCOLUMN_H -#define FUNCTIONCOLUMN_H +#pragma once #include #include #include @@ -326,5 +325,4 @@ private: std::ostream& operator<<(std::ostream& output, const FunctionColumn& rhs); } -#endif //FUNCTIONCOLUMN_H diff --git a/dbcon/execplan/groupconcatcolumn.h b/dbcon/execplan/groupconcatcolumn.h index 8a1982e74..bd91c1872 100644 --- a/dbcon/execplan/groupconcatcolumn.h +++ b/dbcon/execplan/groupconcatcolumn.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef GROUPCONCATCOLUMN_H -#define GROUPCONCATCOLUMN_H +#pragma once #include #include "calpontselectexecutionplan.h" @@ -149,5 +148,4 @@ private: std::ostream& operator<<(std::ostream& os, const GroupConcatColumn& rhs); } -#endif //GROUPCONCATCOLUMN_H diff --git a/dbcon/execplan/intervalcolumn.h b/dbcon/execplan/intervalcolumn.h index 6c6765422..c271d99e0 100644 --- a/dbcon/execplan/intervalcolumn.h +++ b/dbcon/execplan/intervalcolumn.h @@ -23,8 +23,7 @@ /** @file */ -#ifndef INTERVALCOLUMN_H -#define INTERVALCOLUMN_H +#pragma once #include #include #include @@ -126,4 +125,3 @@ private: std::ostream& operator<<(std::ostream& output, const IntervalColumn& rhs); } -#endif //INTERVALCOLUMN_H diff --git a/dbcon/execplan/logicoperator.h b/dbcon/execplan/logicoperator.h index 74cbc0cf8..f2b970bcf 100644 --- a/dbcon/execplan/logicoperator.h +++ b/dbcon/execplan/logicoperator.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef LOGICOPERATOR_H -#define LOGICOPERATOR_H +#pragma once #include #include #include @@ -186,5 +185,4 @@ private: std::ostream& operator<<(std::ostream& os, const LogicOperator& rhs); } -#endif diff --git a/dbcon/execplan/mcsanalyzetableexecutionplan.h b/dbcon/execplan/mcsanalyzetableexecutionplan.h index 4090174be..0cfe16974 100644 --- a/dbcon/execplan/mcsanalyzetableexecutionplan.h +++ b/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 #include #include @@ -167,4 +166,3 @@ class MCSAnalyzeTableExecutionPlan : public CalpontExecutionPlan uint32_t fLocalQuery; }; } // namespace execplan -#endif diff --git a/dbcon/execplan/mysqlexecutionplan.h b/dbcon/execplan/mysqlexecutionplan.h index 3ed8d5c92..a8a530eab 100644 --- a/dbcon/execplan/mysqlexecutionplan.h +++ b/dbcon/execplan/mysqlexecutionplan.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef MYSQLEXECUTIONPLAN_H -#define MYSQLEXECUTIONPLAN_H +#pragma once #include #include "vendorexecutionplan.h" @@ -97,5 +96,4 @@ private: */ }; } -#endif //MYSQLEXECUTIONPLAN_H diff --git a/dbcon/execplan/njlcolumnresult.h b/dbcon/execplan/njlcolumnresult.h index d75013675..75d8de31c 100644 --- a/dbcon/execplan/njlcolumnresult.h +++ b/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 diff --git a/dbcon/execplan/objectidmanager.h b/dbcon/execplan/objectidmanager.h index a0427f3ce..f24dda312 100644 --- a/dbcon/execplan/objectidmanager.h +++ b/dbcon/execplan/objectidmanager.h @@ -24,8 +24,7 @@ * class ObjectIDManager interface. */ -#ifndef OBJECTIDMANAGER_H_ -#define OBJECTIDMANAGER_H_ +#pragma once #include #include @@ -195,4 +194,3 @@ private: } // namespace -#endif diff --git a/dbcon/execplan/objectreader.h b/dbcon/execplan/objectreader.h index a3cba13c5..e8907fa4c 100644 --- a/dbcon/execplan/objectreader.h +++ b/dbcon/execplan/objectreader.h @@ -24,8 +24,7 @@ * class ObjectReader interface */ -#ifndef EXECPLAN_OBJECTREADER_H -#define EXECPLAN_OBJECTREADER_H +#pragma once #include #include @@ -170,5 +169,4 @@ public: }; } -#endif // EXECPLAN_OBJECTREADER_H diff --git a/dbcon/execplan/operator.h b/dbcon/execplan/operator.h index 660f9f8c6..8758ef689 100644 --- a/dbcon/execplan/operator.h +++ b/dbcon/execplan/operator.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef OPERATOR_H -#define OPERATOR_H +#pragma once #include #include #include @@ -245,5 +244,4 @@ std::ostream& operator<<(std::ostream& os, const Operator& rhs); } -#endif //OPERATOR_H diff --git a/dbcon/execplan/oracleexecutionplan.h b/dbcon/execplan/oracleexecutionplan.h index c121e329e..8ff890c13 100644 --- a/dbcon/execplan/oracleexecutionplan.h +++ b/dbcon/execplan/oracleexecutionplan.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef ORACLEEXECUTIONPLAN_H -#define ORACLEEXECUTIONPLAN_H +#pragma once #include #include "vendorexecutionplan.h" @@ -97,5 +96,4 @@ private: */ }; } -#endif //ORACLEEXECUTIONPLAN_H diff --git a/dbcon/execplan/outerjoinonfilter.h b/dbcon/execplan/outerjoinonfilter.h index 7d28aa21a..7d00f4db2 100644 --- a/dbcon/execplan/outerjoinonfilter.h +++ b/dbcon/execplan/outerjoinonfilter.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef OUTERJOINONFILTER_H -#define OUTERJOINONFILTER_H +#pragma once #include #include "filter.h" @@ -125,5 +124,4 @@ private: std::ostream& operator<<(std::ostream& output, const OuterJoinOnFilter& rhs); } -#endif //OUTERJOINONFILTER_H diff --git a/dbcon/execplan/parsetree.h b/dbcon/execplan/parsetree.h index 34131615d..3c5f7e8d0 100644 --- a/dbcon/execplan/parsetree.h +++ b/dbcon/execplan/parsetree.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef PARSETREE_H -#define PARSETREE_H +#pragma once #include #include @@ -584,4 +583,3 @@ typedef boost::shared_ptr SPTP; } // namespace -#endif diff --git a/dbcon/execplan/predicateoperator.h b/dbcon/execplan/predicateoperator.h index 154771112..8b3c1cdd5 100644 --- a/dbcon/execplan/predicateoperator.h +++ b/dbcon/execplan/predicateoperator.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef PREDICATEOPERATOR_H -#define PREDICATEOPERATOR_H +#pragma once #include #include @@ -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 diff --git a/dbcon/execplan/pseudocolumn.h b/dbcon/execplan/pseudocolumn.h index 51ad55dcb..7fe7ff4a2 100644 --- a/dbcon/execplan/pseudocolumn.h +++ b/dbcon/execplan/pseudocolumn.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef PSEUDOCOLUMN_H -#define PSEUDOCOLUMN_H +#pragma once #include #include "simplecolumn.h" @@ -165,5 +164,4 @@ private: } // namespace execplan -#endif //PSEUDOCOLUMN_H diff --git a/dbcon/execplan/range.h b/dbcon/execplan/range.h index 814c44bac..6082c3c8f 100644 --- a/dbcon/execplan/range.h +++ b/dbcon/execplan/range.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef RANGE_H -#define RANGE_H +#pragma once #include /** @@ -96,5 +95,4 @@ private: */ }; } -#endif //RANGE_H diff --git a/dbcon/execplan/returnedcolumn.h b/dbcon/execplan/returnedcolumn.h index 6c07f5694..e5446be85 100644 --- a/dbcon/execplan/returnedcolumn.h +++ b/dbcon/execplan/returnedcolumn.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef RETURNEDCOLUMN_H -#define RETURNEDCOLUMN_H +#pragma once #include #include #include @@ -382,5 +381,4 @@ protected: std::ostream& operator<<(std::ostream& os, const ReturnedColumn& rhs); } -#endif //RETURNEDCOLUMN_H diff --git a/dbcon/execplan/rowcolumn.h b/dbcon/execplan/rowcolumn.h index 7a227f974..cd49d7451 100644 --- a/dbcon/execplan/rowcolumn.h +++ b/dbcon/execplan/rowcolumn.h @@ -21,8 +21,7 @@ ***********************************************************************/ /** @file */ -#ifndef ROWCOLUMN_H -#define ROWCOLUMN_H +#pragma once #include #include #include @@ -182,5 +181,4 @@ public: std::ostream& operator<<(std::ostream& output, const RowColumn& rhs); } -#endif //SIMPLECOLUMN_H diff --git a/dbcon/execplan/selectfilter.h b/dbcon/execplan/selectfilter.h index b6deca824..91279876f 100644 --- a/dbcon/execplan/selectfilter.h +++ b/dbcon/execplan/selectfilter.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef SELECTFILTER_H -#define SELECTFILTER_H +#pragma once #include #include "filter.h" @@ -187,5 +186,4 @@ private: std::ostream& operator<<(std::ostream& output, const SelectFilter& rhs); } -#endif //SELECTFILTER_H diff --git a/dbcon/execplan/sessionmanager.h b/dbcon/execplan/sessionmanager.h index e7dab7874..88b62c594 100644 --- a/dbcon/execplan/sessionmanager.h +++ b/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: diff --git a/dbcon/execplan/sessionmonitor.h b/dbcon/execplan/sessionmonitor.h index cf31b63b3..37dad66e7 100644 --- a/dbcon/execplan/sessionmonitor.h +++ b/dbcon/execplan/sessionmonitor.h @@ -24,8 +24,7 @@ * class SessionMonitor interface */ -#ifndef _SESSIONMONITOR_H -#define _SESSIONMONITOR_H +#pragma once #include #include @@ -341,4 +340,3 @@ private: } //namespace -#endif diff --git a/dbcon/execplan/simplecolumn.h b/dbcon/execplan/simplecolumn.h index ea29444a7..0213a1b2c 100644 --- a/dbcon/execplan/simplecolumn.h +++ b/dbcon/execplan/simplecolumn.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef SIMPLECOLUMN_H -#define SIMPLECOLUMN_H +#pragma once #include #include @@ -394,5 +393,4 @@ void getSimpleCols(ParseTree* n, void* obj); ParseTree* replaceRefCol(ParseTree*& n, CalpontSelectExecutionPlan::ReturnedColumnList&); } -#endif //SIMPLECOLUMN_H diff --git a/dbcon/execplan/simplecolumn_decimal.h b/dbcon/execplan/simplecolumn_decimal.h index 4c806c65f..2e3c45aa6 100644 --- a/dbcon/execplan/simplecolumn_decimal.h +++ b/dbcon/execplan/simplecolumn_decimal.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef SIMPLECOLUMNDECIMAL_H -#define SIMPLECOLUMNDECIMAL_H +#pragma once #include #include #include @@ -268,5 +267,4 @@ void SimpleColumn_Decimal::unserialize(messageqcpp::ByteStream& b) } } -#endif //SIMPLECOLUMN_INT_H diff --git a/dbcon/execplan/simplecolumn_int.h b/dbcon/execplan/simplecolumn_int.h index 7e00207ca..a875858ec 100644 --- a/dbcon/execplan/simplecolumn_int.h +++ b/dbcon/execplan/simplecolumn_int.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef SIMPLECOLUMNINT_H -#define SIMPLECOLUMNINT_H +#pragma once #include #include @@ -274,5 +273,4 @@ void SimpleColumn_INT::unserialize(messageqcpp::ByteStream& b) } } -#endif //SIMPLECOLUMN_INT_H diff --git a/dbcon/execplan/simplecolumn_uint.h b/dbcon/execplan/simplecolumn_uint.h index 14144e847..7e1b0a7c6 100644 --- a/dbcon/execplan/simplecolumn_uint.h +++ b/dbcon/execplan/simplecolumn_uint.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef SIMPLECOLUMNUINT_H -#define SIMPLECOLUMNUINT_H +#pragma once #include #include @@ -282,5 +281,4 @@ void SimpleColumn_UINT::unserialize(messageqcpp::ByteStream& b) } } -#endif //SIMPLECOLUMN_INT_H diff --git a/dbcon/execplan/simplefilter.h b/dbcon/execplan/simplefilter.h index 4b3679777..3d33f9175 100644 --- a/dbcon/execplan/simplefilter.h +++ b/dbcon/execplan/simplefilter.h @@ -23,8 +23,7 @@ ***********************************************************************/ /** @file */ -#ifndef SIMPLEFILTER_H -#define SIMPLEFILTER_H +#pragma once #include #include #include @@ -285,5 +284,4 @@ typedef boost::shared_ptr SSFP; std::ostream& operator<<(std::ostream& output, const SimpleFilter& rhs); } -#endif //SIMPLEFILTER_H diff --git a/dbcon/execplan/simplescalarfilter.h b/dbcon/execplan/simplescalarfilter.h index 8d1a7b5cb..d34248335 100644 --- a/dbcon/execplan/simplescalarfilter.h +++ b/dbcon/execplan/simplescalarfilter.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef SIMPLESCALARFILTER_H -#define SIMPLESCALARFILTER_H +#pragma once #include #include #include @@ -169,5 +168,4 @@ private: std::ostream& operator<<(std::ostream& output, const SimpleScalarFilter& rhs); } -#endif //SELECTFILTER_H diff --git a/dbcon/execplan/treenode.h b/dbcon/execplan/treenode.h index e9dbe5903..238d72465 100644 --- a/dbcon/execplan/treenode.h +++ b/dbcon/execplan/treenode.h @@ -21,8 +21,7 @@ /** @file */ -#ifndef CALPONT_TREENODE_H -#define CALPONT_TREENODE_H +#pragma once #include #include @@ -1175,4 +1174,3 @@ std::ostream& operator<<(std::ostream& output, const TreeNode& rhs); } -#endif diff --git a/dbcon/execplan/treenodeimpl.h b/dbcon/execplan/treenodeimpl.h index 3a5b9f048..ffaa18efe 100644 --- a/dbcon/execplan/treenodeimpl.h +++ b/dbcon/execplan/treenodeimpl.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef EXECPLAN_TREENODEIMPL_H -#define EXECPLAN_TREENODEIMPL_H +#pragma once #include #include @@ -133,5 +132,4 @@ private: std::ostream& operator<<(std::ostream& os, const TreeNodeImpl& rhs); } -#endif //EXECPLAN_TREENODEIMPL_H diff --git a/dbcon/execplan/udafcolumn.h b/dbcon/execplan/udafcolumn.h index da9f7fff3..4b2d78070 100644 --- a/dbcon/execplan/udafcolumn.h +++ b/dbcon/execplan/udafcolumn.h @@ -17,8 +17,7 @@ MA 02110-1301, USA. */ -#ifndef UDAFCOLUMN_H -#define UDAFCOLUMN_H +#pragma once #include #include "calpontselectexecutionplan.h" @@ -132,5 +131,4 @@ private: std::ostream& operator<<(std::ostream& os, const UDAFColumn& rhs); } -#endif //UDAFCOLUMN_H diff --git a/dbcon/execplan/vendorexecutionplan.h b/dbcon/execplan/vendorexecutionplan.h index 662bd4a5a..5e0b37125 100644 --- a/dbcon/execplan/vendorexecutionplan.h +++ b/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 diff --git a/dbcon/execplan/wf_frame.h b/dbcon/execplan/wf_frame.h index 2472cbbe3..e422f1c99 100644 --- a/dbcon/execplan/wf_frame.h +++ b/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 #include #include @@ -88,4 +87,3 @@ struct WF_OrderBy }; } -#endif diff --git a/dbcon/execplan/windowfunctioncolumn.h b/dbcon/execplan/windowfunctioncolumn.h index 36ef2099b..495b4fc1e 100644 --- a/dbcon/execplan/windowfunctioncolumn.h +++ b/dbcon/execplan/windowfunctioncolumn.h @@ -24,8 +24,7 @@ /** @file */ -#ifndef WINDOW_FUNCTION_COLUMN_H -#define WINDOW_FUNCTION_COLUMN_H +#pragma once #include #include #include @@ -262,4 +261,3 @@ std::ostream& operator<<(std::ostream& output, const WindowFunctionColumn& rhs); void getWindowFunctionCols(ParseTree* n, void* obj); } -#endif //WINDOW_FUNCTION_COLUMN_H diff --git a/dbcon/joblist/bandeddl.h b/dbcon/joblist/bandeddl.h index 050544d02..fbf4eb579 100644 --- a/dbcon/joblist/bandeddl.h +++ b/dbcon/joblist/bandeddl.h @@ -33,8 +33,7 @@ #include -#ifndef _BANDEDDL_HPP_ -#define _BANDEDDL_HPP_ +#pragma once namespace joblist { @@ -393,5 +392,4 @@ uint64_t BandedDL::totalSize() } // namespace -#endif diff --git a/dbcon/joblist/batchprimitiveprocessor-jl.h b/dbcon/joblist/batchprimitiveprocessor-jl.h index cdc03e262..9b87f1110 100644 --- a/dbcon/joblist/batchprimitiveprocessor-jl.h +++ b/dbcon/joblist/batchprimitiveprocessor-jl.h @@ -29,8 +29,7 @@ // /** @file */ -#ifndef BATCHPRIMITIVEPROCESSORJL_H_ -#define BATCHPRIMITIVEPROCESSORJL_H_ +#pragma once #include #include @@ -370,6 +369,5 @@ private: } -#endif // vim:ts=4 sw=4: diff --git a/dbcon/joblist/bucketdl.h b/dbcon/joblist/bucketdl.h index 9df73b966..8a76182ce 100644 --- a/dbcon/joblist/bucketdl.h +++ b/dbcon/joblist/bucketdl.h @@ -34,8 +34,7 @@ #include #include #include -#ifndef _BUCKETDL_HPP_ -#define _BUCKETDL_HPP_ +#pragma once namespace joblist { @@ -854,4 +853,3 @@ std::list& BucketDL::diskIoInfoList(uint64_t bucket) } //namespace -#endif diff --git a/dbcon/joblist/columncommand-jl.h b/dbcon/joblist/columncommand-jl.h index 9206f484d..afdbd852a 100644 --- a/dbcon/joblist/columncommand-jl.h +++ b/dbcon/joblist/columncommand-jl.h @@ -29,8 +29,7 @@ // /** @file */ -#ifndef COLUMNCOMMANDJL_H_ -#define COLUMNCOMMANDJL_H_ +#pragma once #include "primitivestep.h" #include "command-jl.h" @@ -131,6 +130,5 @@ private: } -#endif // vim:ts=4 sw=4: diff --git a/dbcon/joblist/command-jl.h b/dbcon/joblist/command-jl.h index 00a7be8cb..ace7d8e31 100644 --- a/dbcon/joblist/command-jl.h +++ b/dbcon/joblist/command-jl.h @@ -17,8 +17,7 @@ /** @file */ -#ifndef COMMANDJL_H -#define COMMANDJL_H +#pragma once #include #include @@ -114,4 +113,3 @@ typedef boost::shared_ptr SCommand; } -#endif diff --git a/dbcon/joblist/crossenginestep.h b/dbcon/joblist/crossenginestep.h index bce3ee048..771200812 100644 --- a/dbcon/joblist/crossenginestep.h +++ b/dbcon/joblist/crossenginestep.h @@ -18,8 +18,7 @@ // $Id: crossenginestep.h 9620 2013-06-13 15:51:52Z pleblanc $ -#ifndef JOBLIST_CROSSENGINESTEP_H -#define JOBLIST_CROSSENGINESTEP_H +#pragma once #include #include @@ -237,7 +236,6 @@ protected: -#endif // JOBLIST_CROSSENGINESTEP_H // vim:ts=4 sw=4: diff --git a/dbcon/joblist/datalist.h b/dbcon/joblist/datalist.h index 9eb6777cc..7ff782de5 100644 --- a/dbcon/joblist/datalist.h +++ b/dbcon/joblist/datalist.h @@ -28,8 +28,7 @@ #include "calpontsystemcatalog.h" -#ifndef _DATALIST_HPP_ -#define _DATALIST_HPP_ +#pragma once namespace joblist { @@ -221,4 +220,3 @@ void DataList::setDiskElemSize(uint32_t size1st, uint32_t size2nd) } // namespace -#endif diff --git a/dbcon/joblist/datalistimpl.h b/dbcon/joblist/datalistimpl.h index 4cb8c984d..091b59a8e 100644 --- a/dbcon/joblist/datalistimpl.h +++ b/dbcon/joblist/datalistimpl.h @@ -33,8 +33,7 @@ #include "datalist.h" -#ifndef _DATALISTIMPL_HPP_ -#define _DATALISTIMPL_HPP_ +#pragma once namespace joblist { @@ -272,4 +271,3 @@ void DataListImpl::shrink() } //namespace -#endif diff --git a/dbcon/joblist/dictstep-jl.h b/dbcon/joblist/dictstep-jl.h index a9782acf4..58faf911d 100644 --- a/dbcon/joblist/dictstep-jl.h +++ b/dbcon/joblist/dictstep-jl.h @@ -29,8 +29,7 @@ // /** @file */ -#ifndef DICTSTEP_JL_H_ -#define DICTSTEP_JL_H_ +#pragma once #include "jobstep.h" #include "command-jl.h" @@ -81,4 +80,3 @@ private: }; // namespace -#endif diff --git a/dbcon/joblist/diskjoinstep.h b/dbcon/joblist/diskjoinstep.h index fbdda890a..f2ef538a8 100644 --- a/dbcon/joblist/diskjoinstep.h +++ b/dbcon/joblist/diskjoinstep.h @@ -22,8 +22,7 @@ #include "threadnaming.h" #include "../../utils/threadpool/prioritythreadpool.h" -#ifndef DISKJOINSTEP_H -#define DISKJOINSTEP_H +#pragma once namespace joblist { @@ -152,4 +151,3 @@ private: } -#endif // DISKJOINSTEP_H diff --git a/dbcon/joblist/distributedenginecomm.h b/dbcon/joblist/distributedenginecomm.h index 01f2cf194..3f35c518e 100644 --- a/dbcon/joblist/distributedenginecomm.h +++ b/dbcon/joblist/distributedenginecomm.h @@ -30,8 +30,7 @@ // /** @file */ -#ifndef DISTENGINECOMM_H -#define DISTENGINECOMM_H +#pragma once #include #include @@ -306,4 +305,3 @@ private: #undef EXPORT -#endif // DISTENGINECOMM_H diff --git a/dbcon/joblist/elementcompression.h b/dbcon/joblist/elementcompression.h index 669d48103..08060f629 100644 --- a/dbcon/joblist/elementcompression.h +++ b/dbcon/joblist/elementcompression.h @@ -22,8 +22,7 @@ /** @file */ -#ifndef ELEMENTCOMPRESSION_H_ -#define ELEMENTCOMPRESSION_H_ +#pragma once #include #include @@ -557,4 +556,3 @@ ElementCompression::readWith32Rid( } // end of joblist namespace -#endif diff --git a/dbcon/joblist/elementtype.h b/dbcon/joblist/elementtype.h index 401f10bf4..660458581 100644 --- a/dbcon/joblist/elementtype.h +++ b/dbcon/joblist/elementtype.h @@ -20,8 +20,7 @@ */ /** @file */ -#ifndef JOBLIST_ELEMENTTYPE_H_ -#define JOBLIST_ELEMENTTYPE_H_ +#pragma once #include #include @@ -650,6 +649,5 @@ extern std::ostream& omitOidInDL ( std::ostream& strm ); #endif -#endif // vim:ts=4 sw=4: diff --git a/dbcon/joblist/errorinfo.h b/dbcon/joblist/errorinfo.h index 6b37e3733..d10b7b782 100644 --- a/dbcon/joblist/errorinfo.h +++ b/dbcon/joblist/errorinfo.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef JOBLIST_ERROR_INFO_H_ -#define JOBLIST_ERROR_INFO_H_ +#pragma once #include #include @@ -52,7 +51,6 @@ typedef boost::shared_ptr SErrorInfo; } -#endif // JOBLIST_ERROR_INFO_H_ // vim:ts=4 sw=4: diff --git a/dbcon/joblist/expressionstep.h b/dbcon/joblist/expressionstep.h index 1974ad42e..751fac177 100644 --- a/dbcon/joblist/expressionstep.h +++ b/dbcon/joblist/expressionstep.h @@ -22,8 +22,7 @@ * class ExpStep interface */ -#ifndef JOBLIST_EXPRESSION_STEP_H -#define JOBLIST_EXPRESSION_STEP_H +#pragma once //#define NDEBUG #include "jobstep.h" @@ -271,5 +270,4 @@ private: } -#endif // JOBLIST_EXPRESSION_STEP_H diff --git a/dbcon/joblist/fifo.h b/dbcon/joblist/fifo.h index 429572ed5..9065f4525 100644 --- a/dbcon/joblist/fifo.h +++ b/dbcon/joblist/fifo.h @@ -25,8 +25,7 @@ * class XXX interface */ -#ifndef FIFO_HPP__ -#define FIFO_HPP__ +#pragma once #include #include @@ -536,6 +535,5 @@ const } // namespace -#endif // vim:ts=4 sw=4: diff --git a/dbcon/joblist/filtercommand-jl.h b/dbcon/joblist/filtercommand-jl.h index 99ec566a0..64870f5ae 100644 --- a/dbcon/joblist/filtercommand-jl.h +++ b/dbcon/joblist/filtercommand-jl.h @@ -24,8 +24,7 @@ * class FilterCommand interface */ -#ifndef JOBLIST_FILTERCOMMANDJL_H_ -#define JOBLIST_FILTERCOMMANDJL_H_ +#pragma once #include "joblist.h" #include "command-jl.h" @@ -62,5 +61,4 @@ private: }; -#endif // JOBLIST_FILTERCOMMANDJL_H_ diff --git a/dbcon/joblist/groupconcat.h b/dbcon/joblist/groupconcat.h index e0bc243c1..395ec58c3 100644 --- a/dbcon/joblist/groupconcat.h +++ b/dbcon/joblist/groupconcat.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef GROUP_CONCAT_H -#define GROUP_CONCAT_H +#pragma once #include #include @@ -192,5 +191,4 @@ protected: #undef EXPORT -#endif // GROUP_CONCAT_H diff --git a/dbcon/joblist/jl_logger.h b/dbcon/joblist/jl_logger.h index cfa4da08e..577eb9b66 100644 --- a/dbcon/joblist/jl_logger.h +++ b/dbcon/joblist/jl_logger.h @@ -21,8 +21,7 @@ /** @file */ -#ifndef JOBLIST_LOGGER_H_ -#define JOBLIST_LOGGER_H_ +#pragma once #include @@ -96,5 +95,4 @@ void catchHandler(const std::string& s, int c, SErrorInfo& errorInfo, unsigned s } -#endif diff --git a/dbcon/joblist/jlf_common.h b/dbcon/joblist/jlf_common.h index 582f81621..ba09b7d79 100644 --- a/dbcon/joblist/jlf_common.h +++ b/dbcon/joblist/jlf_common.h @@ -22,8 +22,7 @@ /** @file jlf_common.h * */ -#ifndef JLF_COMMON_H__ -#define JLF_COMMON_H__ +#pragma once #include #include @@ -497,4 +496,3 @@ bool compatibleColumnTypes(const execplan::CalpontSystemCatalog::ColDataType& dt } // end of jlf_common namespace -#endif diff --git a/dbcon/joblist/jlf_execplantojoblist.h b/dbcon/joblist/jlf_execplantojoblist.h index 6f9fb5daf..a24bc3a1d 100644 --- a/dbcon/joblist/jlf_execplantojoblist.h +++ b/dbcon/joblist/jlf_execplantojoblist.h @@ -24,8 +24,7 @@ /** @file jlf_execplantojoblist.h * */ -#ifndef JLF_EXECPLANTOJOBLIST_H__ -#define JLF_EXECPLANTOJOBLIST_H__ +#pragma once #include "calpontexecutionplan.h" #include "calpontselectexecutionplan.h" @@ -67,4 +66,3 @@ private: } // end of joblist namespace -#endif diff --git a/dbcon/joblist/jlf_graphics.h b/dbcon/joblist/jlf_graphics.h index 049eb98a1..13263ff27 100644 --- a/dbcon/joblist/jlf_graphics.h +++ b/dbcon/joblist/jlf_graphics.h @@ -19,8 +19,7 @@ /** @file */ -#ifndef JLF_GRAPHICS_H__ -#define JLF_GRAPHICS_H__ +#pragma once #include @@ -37,5 +36,4 @@ std::ostream& writeDotCmds(std::ostream& dotFile, const joblist::JobStepVector& } -#endif diff --git a/dbcon/joblist/jlf_subquery.h b/dbcon/joblist/jlf_subquery.h index d5c9d8bac..605bc4feb 100644 --- a/dbcon/joblist/jlf_subquery.h +++ b/dbcon/joblist/jlf_subquery.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef JLF_SUBQUERY_H -#define JLF_SUBQUERY_H +#pragma once #include "jlf_common.h" @@ -56,5 +55,4 @@ SJSTEP doUnionSub(execplan::CalpontExecutionPlan*, JobInfo&); } -#endif // JLF_SUBQUERY_H diff --git a/dbcon/joblist/jlf_tuplejoblist.h b/dbcon/joblist/jlf_tuplejoblist.h index c09fd2ff4..e240833fe 100644 --- a/dbcon/joblist/jlf_tuplejoblist.h +++ b/dbcon/joblist/jlf_tuplejoblist.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef JLF_TUPLEJOBLIST_H -#define JLF_TUPLEJOBLIST_H +#pragma once #include "calpontsystemcatalog.h" #include "joblist.h" @@ -148,5 +147,4 @@ using PostJoinFilterKeys = std::vector, std::vector>>; } -#endif // JLF_TUPLEJOBLIST_H diff --git a/dbcon/joblist/joblist.h b/dbcon/joblist/joblist.h index ce85db6d3..0bf6e861a 100644 --- a/dbcon/joblist/joblist.h +++ b/dbcon/joblist/joblist.h @@ -21,8 +21,7 @@ /** @file */ -#ifndef JOBLIST_JOBLIST_H_ -#define JOBLIST_JOBLIST_H_ +#pragma once #include #include @@ -261,6 +260,5 @@ typedef boost::shared_ptr STJLP; #undef EXPORT -#endif // vim:ts=4 sw=4: diff --git a/dbcon/joblist/joblistfactory.h b/dbcon/joblist/joblistfactory.h index 9ccef730f..2fa42d29c 100644 --- a/dbcon/joblist/joblistfactory.h +++ b/dbcon/joblist/joblistfactory.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef JOBLISTFACTORY_H -#define JOBLISTFACTORY_H +#pragma once #include @@ -77,5 +76,4 @@ private: #undef EXPORT -#endif //JOBLISTFACTORY_H diff --git a/dbcon/joblist/joblisttypes.h b/dbcon/joblist/joblisttypes.h index 6d5664c57..093f097bb 100644 --- a/dbcon/joblist/joblisttypes.h +++ b/dbcon/joblist/joblisttypes.h @@ -21,8 +21,7 @@ */ /** @file */ -#ifndef JOBLISTTYPES_ -#define JOBLISTTYPES_ +#pragma once #include #include @@ -103,5 +102,4 @@ const JoinType INIT = 0, CORRELATED = 0x100; } -#endif diff --git a/dbcon/joblist/jobstep.h b/dbcon/joblist/jobstep.h index 88dbeb94c..4a0c32572 100644 --- a/dbcon/joblist/jobstep.h +++ b/dbcon/joblist/jobstep.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef JOBLIST_JOBSTEP_H_ -#define JOBLIST_JOBSTEP_H_ +#pragma once #include #include @@ -560,6 +559,5 @@ typedef boost::shared_ptr SJSTEP; } -#endif // JOBLIST_JOBSTEP_H_ // vim:ts=4 sw=4: diff --git a/dbcon/joblist/largedatalist.h b/dbcon/joblist/largedatalist.h index 7aedead4b..307bcc3c6 100644 --- a/dbcon/joblist/largedatalist.h +++ b/dbcon/joblist/largedatalist.h @@ -24,8 +24,7 @@ * class XXX interface */ -#ifndef _LARGEDATALIST_HPP -#define _LARGEDATALIST_HPP +#pragma once #include #include @@ -1213,4 +1212,3 @@ void LargeDataList::setCompressionMode() } // namespace -#endif diff --git a/dbcon/joblist/largehashjoin.h b/dbcon/joblist/largehashjoin.h index c5315b355..c86f3f619 100644 --- a/dbcon/joblist/largehashjoin.h +++ b/dbcon/joblist/largehashjoin.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef LARGEHASHJOIN_H -#define LARGEHASHJOIN_H +#pragma once // $Id: largehashjoin.h 9655 2013-06-25 23:08:13Z xlou $ // // C++ Implementation: hashjoin @@ -591,4 +590,3 @@ void HashJoin::createHash(BucketDL* srcBucketDL, } //namespace -#endif diff --git a/dbcon/joblist/lbidlist.h b/dbcon/joblist/lbidlist.h index 5009d5039..e8ae96d8e 100644 --- a/dbcon/joblist/lbidlist.h +++ b/dbcon/joblist/lbidlist.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef JOBLIST_LBIDLIST_H -#define JOBLIST_LBIDLIST_H +#pragma once #include #include "joblisttypes.h" @@ -160,4 +159,3 @@ private: } // joblist -#endif diff --git a/dbcon/joblist/limitedorderby.h b/dbcon/joblist/limitedorderby.h index d54acf56e..cff86acf1 100644 --- a/dbcon/joblist/limitedorderby.h +++ b/dbcon/joblist/limitedorderby.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef LIMITED_ORDER_BY_H -#define LIMITED_ORDER_BY_H +#pragma once #include #include "rowgroup.h" @@ -70,5 +69,4 @@ protected: } -#endif // LIMITED_ORDER_BY_H diff --git a/dbcon/joblist/passthrucommand-jl.h b/dbcon/joblist/passthrucommand-jl.h index 642452fc8..b43905dfb 100644 --- a/dbcon/joblist/passthrucommand-jl.h +++ b/dbcon/joblist/passthrucommand-jl.h @@ -29,8 +29,7 @@ // /** @file */ -#ifndef PASSTHRUCOMMAND_JL -#define PASSTHRUCOMMAND_JL +#pragma once #include "jobstep.h" #include "command-jl.h" @@ -66,4 +65,3 @@ private: }; -#endif diff --git a/dbcon/joblist/primitivemsg.h b/dbcon/joblist/primitivemsg.h index 5b4bbfe05..6c5f33d90 100644 --- a/dbcon/joblist/primitivemsg.h +++ b/dbcon/joblist/primitivemsg.h @@ -22,8 +22,7 @@ /** @file */ -#ifndef JOBLIST_PRIMITIVE_H -#define JOBLIST_PRIMITIVE_H +#pragma once #include @@ -908,6 +907,5 @@ struct LbidAtVer #pragma pack(pop) -#endif //JOBLIST_PRIMITIVE_H // vim:ts=4 sw=4: diff --git a/dbcon/joblist/primitivestep.h b/dbcon/joblist/primitivestep.h index 0a3cdbdb0..8b2d7eecb 100644 --- a/dbcon/joblist/primitivestep.h +++ b/dbcon/joblist/primitivestep.h @@ -21,8 +21,7 @@ /** @file */ -#ifndef JOBLIST_PRIMITIVESTEP_H -#define JOBLIST_PRIMITIVESTEP_H +#pragma once #include #include @@ -1861,7 +1860,6 @@ private: } -#endif // JOBLIST_PRIMITIVESTEP_H // vim:ts=4 sw=4: diff --git a/dbcon/joblist/pseudocc-jl.h b/dbcon/joblist/pseudocc-jl.h index 1fd7e4100..ba9955007 100644 --- a/dbcon/joblist/pseudocc-jl.h +++ b/dbcon/joblist/pseudocc-jl.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef PSEUDOCCJL_H -#define PSEUDOCCJL_H +#pragma once #include "columncommand-jl.h" @@ -44,4 +43,3 @@ private: } -#endif // PSEUDOCCJL_H diff --git a/dbcon/joblist/resourcedistributor.h b/dbcon/joblist/resourcedistributor.h index c27d1fac4..b0dd6193d 100644 --- a/dbcon/joblist/resourcedistributor.h +++ b/dbcon/joblist/resourcedistributor.h @@ -22,8 +22,7 @@ /** * @file */ -#ifndef JOBLIST_RESOURCEDISTRIBUTER_H -#define JOBLIST_RESOURCEDISTRIBUTER_H +#pragma once #include #include @@ -141,4 +140,3 @@ private: } -#endif diff --git a/dbcon/joblist/resourcemanager.h b/dbcon/joblist/resourcemanager.h index 71c525cce..2182cfac7 100644 --- a/dbcon/joblist/resourcemanager.h +++ b/dbcon/joblist/resourcemanager.h @@ -22,8 +22,7 @@ /** * @file */ -#ifndef JOBLIST_RESOURCEMANAGER_H -#define JOBLIST_RESOURCEMANAGER_H +#pragma once #include #include @@ -672,4 +671,3 @@ inline bool ResourceManager::getBoolVal(const std::string& section, const std::s #undef EXPORT -#endif diff --git a/dbcon/joblist/rowestimator.h b/dbcon/joblist/rowestimator.h index a4c702a44..3bd124a04 100644 --- a/dbcon/joblist/rowestimator.h +++ b/dbcon/joblist/rowestimator.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef JOBLIST_ROWESTIMATOR_H -#define JOBLIST_ROWESTIMATOR_H +#pragma once #include #include "joblisttypes.h" @@ -150,4 +149,3 @@ private: } // joblist -#endif diff --git a/dbcon/joblist/rtscommand-jl.h b/dbcon/joblist/rtscommand-jl.h index f1a2084d4..9df6b169c 100644 --- a/dbcon/joblist/rtscommand-jl.h +++ b/dbcon/joblist/rtscommand-jl.h @@ -29,8 +29,7 @@ // /** @file */ -#ifndef RTSCOMMANDJL_H_ -#define RTSCOMMANDJL_H_ +#pragma once #include "jobstep.h" #include "command-jl.h" @@ -73,4 +72,3 @@ private: }; -#endif diff --git a/dbcon/joblist/subquerystep.h b/dbcon/joblist/subquerystep.h index e7c479ba2..806e7502d 100644 --- a/dbcon/joblist/subquerystep.h +++ b/dbcon/joblist/subquerystep.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef SUBQUERY_STEP_H -#define SUBQUERY_STEP_H +#pragma once #include #include @@ -279,6 +278,5 @@ protected: } -#endif // SUBQUERY_STEP_H // vim:ts=4 sw=4: diff --git a/dbcon/joblist/subquerytransformer.h b/dbcon/joblist/subquerytransformer.h index ffea628f2..e27bcbcb8 100644 --- a/dbcon/joblist/subquerytransformer.h +++ b/dbcon/joblist/subquerytransformer.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef SUBQUERY_TRANSFORMER_H -#define SUBQUERY_TRANSFORMER_H +#pragma once #include "elementtype.h" @@ -239,6 +238,5 @@ protected: } -#endif // SUBQUERY_STEP_H // vim:ts=4 sw=4: diff --git a/dbcon/joblist/tablecolumn.h b/dbcon/joblist/tablecolumn.h index 63b3cfba8..45895ff43 100644 --- a/dbcon/joblist/tablecolumn.h +++ b/dbcon/joblist/tablecolumn.h @@ -22,8 +22,7 @@ /** @file */ -#ifndef _TABLECOLUMN_H_ -#define _TABLECOLUMN_H_ +#pragma once #include #include @@ -157,5 +156,4 @@ private: } // namespace -#endif diff --git a/dbcon/joblist/threadsafequeue.h b/dbcon/joblist/threadsafequeue.h index efc677756..3f4b48e15 100644 --- a/dbcon/joblist/threadsafequeue.h +++ b/dbcon/joblist/threadsafequeue.h @@ -20,8 +20,7 @@ */ /** @file */ -#ifndef THREADSAFEQUEUE_H_ -#define THREADSAFEQUEUE_H_ +#pragma once #include #include @@ -351,5 +350,4 @@ private: } -#endif diff --git a/dbcon/joblist/timeset.h b/dbcon/joblist/timeset.h index 1088f1209..026fce8ec 100644 --- a/dbcon/joblist/timeset.h +++ b/dbcon/joblist/timeset.h @@ -24,8 +24,7 @@ * Used to maintain collection of timers tracking elapsed times for set of tasks */ -#ifndef TIMESET_H -#define TIMESET_H +#pragma once #include #include @@ -363,4 +362,3 @@ void TimeSet::timespec_add(const struct timespec& tv1, // start time } }; -#endif diff --git a/dbcon/joblist/timestamp.h b/dbcon/joblist/timestamp.h index 1720bb6fe..c53556c0a 100644 --- a/dbcon/joblist/timestamp.h +++ b/dbcon/joblist/timestamp.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TIMESTAMP_H_ -#define TIMESTAMP_H_ +#pragma once // // $Id: timestamp.h 9210 2013-01-21 14:10:42Z rdempsey $ // @@ -142,5 +141,4 @@ private: } //namespace joblist -#endif diff --git a/dbcon/joblist/tupleaggregatestep.h b/dbcon/joblist/tupleaggregatestep.h index 07884dcb3..561232a7b 100644 --- a/dbcon/joblist/tupleaggregatestep.h +++ b/dbcon/joblist/tupleaggregatestep.h @@ -19,8 +19,7 @@ // $Id: tupleaggregatestep.h 9732 2013-08-02 15:56:15Z pleblanc $ -#ifndef JOBLIST_TUPLEAGGREGATESTEP_H -#define JOBLIST_TUPLEAGGREGATESTEP_H +#pragma once #include "jobstep.h" #include "rowaggregation.h" @@ -234,6 +233,5 @@ private: } // namespace -#endif // JOBLIST_TUPLEAGGREGATESTEP_H // vim:ts=4 sw=4: diff --git a/dbcon/joblist/tupleannexstep.h b/dbcon/joblist/tupleannexstep.h index f9efd459b..ba110cc8e 100644 --- a/dbcon/joblist/tupleannexstep.h +++ b/dbcon/joblist/tupleannexstep.h @@ -19,8 +19,7 @@ // $Id: tupleannexstep.h 9596 2013-06-04 19:59:04Z xlou $ -#ifndef JOBLIST_TUPLEANNEXSTEP_H -#define JOBLIST_TUPLEANNEXSTEP_H +#pragma once #include #include @@ -185,6 +184,5 @@ public: } // namespace -#endif // JOBLIST_TUPLEANNEXSTEP_H // vim:ts=4 sw=4: diff --git a/dbcon/joblist/tupleconstantstep.h b/dbcon/joblist/tupleconstantstep.h index ee38dad1e..48d947360 100644 --- a/dbcon/joblist/tupleconstantstep.h +++ b/dbcon/joblist/tupleconstantstep.h @@ -18,8 +18,7 @@ // $Id: tupleconstantstep.h 9596 2013-06-04 19:59:04Z xlou $ -#ifndef JOBLIST_TUPLECONSTANTSTEP_H -#define JOBLIST_TUPLECONSTANTSTEP_H +#pragma once #include "jobstep.h" #include "threadnaming.h" @@ -188,6 +187,5 @@ protected: } // namespace -#endif // JOBLIST_TUPLECONSTANTSTEP_H // vim:ts=4 sw=4: diff --git a/dbcon/joblist/tuplehashjoin.h b/dbcon/joblist/tuplehashjoin.h index 884644eba..996b53d99 100644 --- a/dbcon/joblist/tuplehashjoin.h +++ b/dbcon/joblist/tuplehashjoin.h @@ -19,8 +19,7 @@ // $Id: tuplehashjoin.h 9655 2013-06-25 23:08:13Z xlou $ -#ifndef TUPLEHASHJOIN_H_ -#define TUPLEHASHJOIN_H_ +#pragma once #include "jobstep.h" #include "calpontsystemcatalog.h" @@ -630,5 +629,4 @@ private: } -#endif // vim:ts=4 sw=4: diff --git a/dbcon/joblist/tuplehavingstep.h b/dbcon/joblist/tuplehavingstep.h index 7b950d4a9..a082fdcbb 100644 --- a/dbcon/joblist/tuplehavingstep.h +++ b/dbcon/joblist/tuplehavingstep.h @@ -18,8 +18,7 @@ // $Id: tuplehavingstep.h 9596 2013-06-04 19:59:04Z xlou $ -#ifndef JOBLIST_TUPLEHAVINGSTEP_H -#define JOBLIST_TUPLEHAVINGSTEP_H +#pragma once #include "jobstep.h" #include "expressionstep.h" @@ -117,6 +116,5 @@ protected: } // namespace -#endif // JOBLIST_TUPLEHAVINGSTEP_H // vim:ts=4 sw=4: diff --git a/dbcon/joblist/tupleunion.h b/dbcon/joblist/tupleunion.h index c3c226672..0eb8f11db 100644 --- a/dbcon/joblist/tupleunion.h +++ b/dbcon/joblist/tupleunion.h @@ -37,8 +37,7 @@ #include "stlpoolallocator.h" #include "threadnaming.h" -#ifndef TUPLEUNION2_H_ -#define TUPLEUNION2_H_ +#pragma once namespace joblist { @@ -206,4 +205,3 @@ private: } -#endif diff --git a/dbcon/joblist/unique32generator.h b/dbcon/joblist/unique32generator.h index a5ae06453..7ba19b438 100644 --- a/dbcon/joblist/unique32generator.h +++ b/dbcon/joblist/unique32generator.h @@ -24,8 +24,7 @@ * */ -#ifndef _UNIQUE32_GENERATOR_H_ -#define _UNIQUE32_GENERATOR_H_ +#pragma once #include #include @@ -61,4 +60,3 @@ private: } // namespace -#endif diff --git a/dbcon/joblist/virtualtable.h b/dbcon/joblist/virtualtable.h index 3d3495e78..06e556ac9 100644 --- a/dbcon/joblist/virtualtable.h +++ b/dbcon/joblist/virtualtable.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef VIRTUAL_TABLE_H -#define VIRTUAL_TABLE_H +#pragma once #include "calpontsystemcatalog.h" #include "returnedcolumn.h" @@ -117,5 +116,4 @@ protected: } -#endif // VIRTUAL_TABLE_H diff --git a/dbcon/joblist/windowfunctionstep.h b/dbcon/joblist/windowfunctionstep.h index 6cb51cb57..819b20a24 100644 --- a/dbcon/joblist/windowfunctionstep.h +++ b/dbcon/joblist/windowfunctionstep.h @@ -19,8 +19,7 @@ // $Id: windowfunctionstep.h 9722 2013-07-25 21:29:10Z pleblanc $ -#ifndef JOBLIST_WINDOWFUNCTIONSTEP_H -#define JOBLIST_WINDOWFUNCTIONSTEP_H +#pragma once #include "../../utils/windowfunction/idborderby.h" #include "jobstep.h" @@ -229,6 +228,5 @@ private: } // namespace -#endif // JOBLIST_WINDOWFUNCTIONSTEP_H // vim:ts=4 sw=4: diff --git a/dbcon/mysql/ha_mcs.h b/dbcon/mysql/ha_mcs.h index 609acb056..a98033f16 100644 --- a/dbcon/mysql/ha_mcs.h +++ b/dbcon/mysql/ha_mcs.h @@ -16,8 +16,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 HA_MCS_H__ -#define HA_MCS_H__ +#pragma once #include #include "idb_mysql.h" @@ -352,4 +351,3 @@ public: friend my_bool cache_start_trans(void *param); }; -#endif //HA_MCS_H__ diff --git a/dbcon/mysql/ha_mcs_datatype.h b/dbcon/mysql/ha_mcs_datatype.h index 830befd4c..0ddf7a856 100644 --- a/dbcon/mysql/ha_mcs_datatype.h +++ b/dbcon/mysql/ha_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 HA_MCS_DATATYPE_H_INCLUDED -#define HA_MCS_DATATYPE_H_INCLUDED +#pragma once /* Interface classes for MariaDB data types (e.g. Field) for TypeHandler. @@ -856,6 +855,5 @@ public: } // end of namespace datatypes -#endif // vim:ts=2 sw=2: diff --git a/dbcon/mysql/ha_mcs_impl.h b/dbcon/mysql/ha_mcs_impl.h index ff21737c5..c659fc135 100644 --- a/dbcon/mysql/ha_mcs_impl.h +++ b/dbcon/mysql/ha_mcs_impl.h @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef HA_MCS_IMPL_H__ -#define HA_MCS_IMPL_H__ +#pragma once #include "idb_mysql.h" @@ -74,5 +73,4 @@ extern std::string ha_mcs_impl_viewtablelock( cal_impl_if::cal_connection_info& extern std::string ha_mcs_impl_cleartablelock( cal_impl_if::cal_connection_info& ci, uint64_t tableLockID); #endif -#endif diff --git a/dbcon/mysql/ha_mcs_impl_if.h b/dbcon/mysql/ha_mcs_impl_if.h index 9d0a9c4e1..bc9a8c702 100644 --- a/dbcon/mysql/ha_mcs_impl_if.h +++ b/dbcon/mysql/ha_mcs_impl_if.h @@ -17,8 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef HA_MCS_IMPL_IF_H__ -#define HA_MCS_IMPL_IF_H__ +#pragma once #include #include #ifdef _MSC_VER @@ -458,5 +457,4 @@ void debug_walk(const Item* item, void* arg); #endif } -#endif diff --git a/dbcon/mysql/ha_mcs_logging.h b/dbcon/mysql/ha_mcs_logging.h index f3bcf108d..e2b2bf798 100644 --- a/dbcon/mysql/ha_mcs_logging.h +++ b/dbcon/mysql/ha_mcs_logging.h @@ -16,8 +16,7 @@ * MA 02110-1301, USA. */ -#ifndef HA_MCS_LOGGING_H__ -#define HA_MCS_LOGGING_H__ +#pragma once #include "messagelog.h" @@ -50,4 +49,3 @@ inline void log_this(THD *thd, const char *message, }; -#endif diff --git a/dbcon/mysql/ha_mcs_opt_rewrites.h b/dbcon/mysql/ha_mcs_opt_rewrites.h index 56ec49a06..c5e01255d 100644 --- a/dbcon/mysql/ha_mcs_opt_rewrites.h +++ b/dbcon/mysql/ha_mcs_opt_rewrites.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef HA_MCS_REWRITES -#define HA_MCS_REWRITES +#pragma once #include "idb_mysql.h" @@ -25,4 +24,3 @@ void first_cond_optimization_flag_toggle(SELECT_LEX *select_lex, void (*func)(SE void first_cond_optimization_flag_unset(SELECT_LEX*); void first_cond_optimization_flag_set(SELECT_LEX*); -#endif diff --git a/dbcon/mysql/ha_mcs_pushdown.h b/dbcon/mysql/ha_mcs_pushdown.h index 01806f0d7..de10a143e 100644 --- a/dbcon/mysql/ha_mcs_pushdown.h +++ b/dbcon/mysql/ha_mcs_pushdown.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef HA_MCS_PUSH -#define HA_MCS_PUSH +#pragma once #define PREFER_MY_CONFIG_H #include "idb_mysql.h" @@ -156,4 +155,3 @@ public: bool prepare() override; }; -#endif diff --git a/dbcon/mysql/ha_mcs_sysvars.h b/dbcon/mysql/ha_mcs_sysvars.h index f0d216860..adae8ee3c 100644 --- a/dbcon/mysql/ha_mcs_sysvars.h +++ b/dbcon/mysql/ha_mcs_sysvars.h @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef MCS_SYSVARS_H__ -#define MCS_SYSVARS_H__ +#pragma once #include #include "idb_mysql.h" @@ -142,4 +141,3 @@ void set_cache_use_import(THD* thd, bool value); ulonglong get_cache_flush_threshold(THD* thd); void set_cache_flush_threshold(THD* thd, ulonglong value); -#endif diff --git a/dbcon/mysql/ha_subquery.h b/dbcon/mysql/ha_subquery.h index 03cd48033..9dc2f1554 100644 --- a/dbcon/mysql/ha_subquery.h +++ b/dbcon/mysql/ha_subquery.h @@ -24,8 +24,7 @@ /** @file */ /** class subquery series interface */ -#ifndef HA_SUBQUERY -#define HA_SUBQUERY +#pragma once //#undef LOG_INFO #include @@ -226,4 +225,3 @@ private: } -#endif diff --git a/dbcon/mysql/ha_tzinfo.h b/dbcon/mysql/ha_tzinfo.h index 4f428651a..cd6f06220 100644 --- a/dbcon/mysql/ha_tzinfo.h +++ b/dbcon/mysql/ha_tzinfo.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef HA_TZINFO -#define HA_TZINFO +#pragma once //#undef LOG_INFO #include @@ -31,4 +30,3 @@ TIME_ZONE_INFO* my_tzinfo_find(THD *thd, const String *name); } -#endif diff --git a/dbcon/mysql/ha_view.h b/dbcon/mysql/ha_view.h index 033a3aa51..866981fdb 100644 --- a/dbcon/mysql/ha_view.h +++ b/dbcon/mysql/ha_view.h @@ -23,8 +23,7 @@ /** @file */ /** class View interface */ -#ifndef HA_VIEW -#define HA_VIEW +#pragma once //#undef LOG_INFO #include "ha_mcs_impl_if.h" @@ -63,4 +62,3 @@ private: } -#endif diff --git a/dbcon/mysql/idb_mysql.h b/dbcon/mysql/idb_mysql.h index 0ee6e857f..b17d6cada 100644 --- a/dbcon/mysql/idb_mysql.h +++ b/dbcon/mysql/idb_mysql.h @@ -18,8 +18,7 @@ // global namespace // // Don't include ANY mysql headers anywhere except here! -#ifndef IDB_MYSQL_H__ -#define IDB_MYSQL_H__ +#pragma once #ifdef TEST_MCSCONFIG_H #error mcsconfig.h was included before idb_mysql.h @@ -118,5 +117,4 @@ inline char* idb_mysql_query_str(THD* thd) } } -#endif // vim:ts=4 sw=4: diff --git a/dbcon/mysql/sm.h b/dbcon/mysql/sm.h index 43da05ee1..4c308bade 100644 --- a/dbcon/mysql/sm.h +++ b/dbcon/mysql/sm.h @@ -21,8 +21,7 @@ ***********************************************************************/ /** @file */ -#ifndef SM_H__ -#define SM_H__ +#pragma once #include #include @@ -288,5 +287,4 @@ extern status_t tpl_close(cpsm_tplh_t*, cpsm_conhdl_t**, querystats::QueryStats& #undef EXPORT -#endif diff --git a/dbcon/mysql/versionnumber.h b/dbcon/mysql/versionnumber.h index edb73a534..2264d946d 100644 --- a/dbcon/mysql/versionnumber.h +++ b/dbcon/mysql/versionnumber.h @@ -1,8 +1,6 @@ -#ifndef VERSIONNUMBER_H_ -#define VERSIONNUMBER_H_ +#pragma once #include const std::string idb_version("1.0.2"); const std::string idb_release("1"); -#endif diff --git a/ddlproc/ddlproc.h b/ddlproc/ddlproc.h index 519a95d22..a1356f3aa 100644 --- a/ddlproc/ddlproc.h +++ b/ddlproc/ddlproc.h @@ -20,8 +20,7 @@ /** * @file */ -#ifndef DDLPROC_H -#define DDLPROC_H +#pragma once #include #include @@ -45,4 +44,3 @@ #include "messagelog.h" -#endif //DDLPROC_H diff --git a/ddlproc/ddlprocessor.h b/ddlproc/ddlprocessor.h index 525927b21..864e67836 100644 --- a/ddlproc/ddlprocessor.h +++ b/ddlproc/ddlprocessor.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef DDLPROCESSOR_H -#define DDLPROCESSOR_H +#pragma once #include "ddlproc.h" #include "threadpool.h" @@ -101,5 +100,4 @@ private: } //namespace ddlprocessor -#endif //DDLPROCESSOR_H diff --git a/dmlproc/batchinsertprocessor.h b/dmlproc/batchinsertprocessor.h index 2c8b3a32d..82a453c72 100644 --- a/dmlproc/batchinsertprocessor.h +++ b/dmlproc/batchinsertprocessor.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef BATCHINSERTPROCESSOR_H__ -#define BATCHINSERTPROCESSOR_H__ +#pragma once #include #include @@ -94,5 +93,4 @@ private: }; } // namespace dmlprocessor -#endif // vim:ts=4 sw=4: diff --git a/dmlproc/dmlproc.h b/dmlproc/dmlproc.h index fa76dc700..959cef028 100644 --- a/dmlproc/dmlproc.h +++ b/dmlproc/dmlproc.h @@ -23,8 +23,7 @@ /** * @file */ -#ifndef DMLPROC_H -#define DMLPROC_H +#pragma once #include #include @@ -34,4 +33,3 @@ #include #include "messagelog.h" -#endif //DMLPROC_H diff --git a/dmlproc/dmlprocessor.h b/dmlproc/dmlprocessor.h index 51676943f..ead90955d 100644 --- a/dmlproc/dmlprocessor.h +++ b/dmlproc/dmlprocessor.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef DMLPROCESSOR_H -#define DMLPROCESSOR_H +#pragma once #include #include "threadpool.h" @@ -328,6 +327,5 @@ protected: } // namespace dmlprocessor -#endif //DMLPROCESSOR_H // vim:ts=4 sw=4: diff --git a/dmlproc/dmlresultbuffer.h b/dmlproc/dmlresultbuffer.h index 89360f906..039793fab 100644 --- a/dmlproc/dmlresultbuffer.h +++ b/dmlproc/dmlresultbuffer.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef DMLRESULTBUFFER_H -#define DMLRESULTBUFFER_H +#pragma once #include #include #include @@ -93,4 +92,3 @@ private: } //namespace dmlprocessor -#endif //DMLRESULTPROCESSOR_H diff --git a/exemgr/activestatementcounter.h b/exemgr/activestatementcounter.h index 9b465b5f3..0326e56ae 100644 --- a/exemgr/activestatementcounter.h +++ b/exemgr/activestatementcounter.h @@ -19,8 +19,7 @@ // /** @file */ -#ifndef ACTIVESTATEMENTCOUNTER_H__ -#define ACTIVESTATEMENTCOUNTER_H__ +#pragma once #include @@ -63,6 +62,5 @@ private: BRM::VSS fVss; }; -#endif // vim:ts=4 sw=4: diff --git a/exemgr/femsghandler.h b/exemgr/femsghandler.h index 603413d52..95cca7b1d 100644 --- a/exemgr/femsghandler.h +++ b/exemgr/femsghandler.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef FEMSGHANDLER_H_ -#define FEMSGHANDLER_H_ +#pragma once #include "joblist.h" #include "inetstreamsocket.h" @@ -47,4 +46,3 @@ private: uint64_t thr; }; -#endif /* FEMSGHANDLER_H_ */ diff --git a/oam/oamcpp/liboamcpp.h b/oam/oamcpp/liboamcpp.h index 53b26ebbd..ad3948449 100644 --- a/oam/oamcpp/liboamcpp.h +++ b/oam/oamcpp/liboamcpp.h @@ -21,8 +21,7 @@ /** * @file */ -#ifndef LIBOAMCPP_H -#define LIBOAMCPP_H +#pragma once #include #include @@ -438,6 +437,5 @@ private: #undef EXPORT -#endif // vim:ts=4 sw=4: diff --git a/oam/oamcpp/oamcache.h b/oam/oamcpp/oamcache.h index 013dcf85a..5f6fb9b11 100644 --- a/oam/oamcpp/oamcache.h +++ b/oam/oamcpp/oamcache.h @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef OAMCACHE_H_ -#define OAMCACHE_H_ +#pragma once #include #include @@ -83,4 +82,3 @@ private: #undef EXPORT -#endif /* OAMCACHE_H_ */ diff --git a/oamapps/columnstoreSupport/mcsSupportUtil.h b/oamapps/columnstoreSupport/mcsSupportUtil.h index 9a8374068..d4750a04e 100644 --- a/oamapps/columnstoreSupport/mcsSupportUtil.h +++ b/oamapps/columnstoreSupport/mcsSupportUtil.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef MCS_SUPPORT_UTIL_H_ -#define MCS_SUPPORT_UTIL_H_ +#pragma once #include #include @@ -34,4 +33,3 @@ void getStorageStatus(FILE * pOutputFile); bool checkLogStatus(std::string filename, std::string phase); std::string getIPAddress(std::string hostName); -#endif diff --git a/primitives/blockcache/blockcacheclient.h b/primitives/blockcache/blockcacheclient.h index 7560a9d9f..3ed59b4c8 100644 --- a/primitives/blockcache/blockcacheclient.h +++ b/primitives/blockcache/blockcacheclient.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef BLOCKCACHEREQUESTCLIENT_H -#define BLOCKCACHEREQUESTCLIENT_H +#pragma once #include "blockrequestprocessor.h" #include "brmtypes.h" @@ -175,6 +174,5 @@ private: } -#endif // vim:ts=4 sw=4: diff --git a/primitives/blockcache/blockrequestprocessor.h b/primitives/blockcache/blockrequestprocessor.h index d6ee5320a..1bce6c3f4 100644 --- a/primitives/blockcache/blockrequestprocessor.h +++ b/primitives/blockcache/blockrequestprocessor.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef BLOCKREQUESTPROCESSOR_H -#define BLOCKREQUESTPROCESSOR_H +#pragma once /*************************************************************************** * @@ -195,6 +194,5 @@ private: }; } -#endif // vim:ts=4 sw=4: diff --git a/primitives/blockcache/fileblockrequestqueue.h b/primitives/blockcache/fileblockrequestqueue.h index 0acec04e6..5002b559f 100644 --- a/primitives/blockcache/fileblockrequestqueue.h +++ b/primitives/blockcache/fileblockrequestqueue.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef FILEBLOCKREQUESTQUEUE_H -#define FILEBLOCKREQUESTQUEUE_H +#pragma once /*************************************************************************** * @@ -114,4 +113,3 @@ private: }; } -#endif diff --git a/primitives/blockcache/filebuffer.h b/primitives/blockcache/filebuffer.h index 5aee1bd1c..8f027e163 100644 --- a/primitives/blockcache/filebuffer.h +++ b/primitives/blockcache/filebuffer.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef FILEBUFFER_H -#define FILEBUFFER_H +#pragma once #include #include @@ -183,4 +182,3 @@ private: typedef std::vector FileBufferPool_t; } -#endif diff --git a/primitives/blockcache/filebuffermgr.h b/primitives/blockcache/filebuffermgr.h index 7a64ab875..b1d8509e5 100644 --- a/primitives/blockcache/filebuffermgr.h +++ b/primitives/blockcache/filebuffermgr.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FILEBUFFERMGR_H -#define FILEBUFFERMGR_H +#pragma once #include #include #include @@ -240,4 +239,3 @@ private: }; } -#endif diff --git a/primitives/blockcache/filerequest.h b/primitives/blockcache/filerequest.h index 3dcf967a9..8d8689ba5 100644 --- a/primitives/blockcache/filerequest.h +++ b/primitives/blockcache/filerequest.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef FILEREQUEST_H -#define FILEREQUEST_H +#pragma once /*************************************************************************** * @@ -324,6 +323,5 @@ private: } -#endif // vim:ts=4 sw=4: diff --git a/primitives/blockcache/fsutils.h b/primitives/blockcache/fsutils.h index 49face7d9..178e5aa09 100644 --- a/primitives/blockcache/fsutils.h +++ b/primitives/blockcache/fsutils.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef FS_UTILS_H__ -#define FS_UTILS_H__ +#pragma once #include @@ -25,5 +24,4 @@ namespace fsutils const std::string symname2devname(const std::string& sympath); } -#endif diff --git a/primitives/blockcache/iomanager.h b/primitives/blockcache/iomanager.h index b7c93fd6f..d52cecc7a 100644 --- a/primitives/blockcache/iomanager.h +++ b/primitives/blockcache/iomanager.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef IOMANAGER_H -#define IOMANAGER_H +#pragma once // $Id: iomanager.h 2145 2013-08-09 22:38:19Z wweeks $ // // C++ Interface: iomanager @@ -163,5 +162,4 @@ void dropFDCache(); void purgeFDCache(std::vector& files); } -#endif // vim:ts=4 sw=4: diff --git a/primitives/blockcache/stats.h b/primitives/blockcache/stats.h index 1e7e2ac9e..2ea4edc17 100644 --- a/primitives/blockcache/stats.h +++ b/primitives/blockcache/stats.h @@ -21,8 +21,7 @@ /** @file */ -#ifndef PRIMPROC_STATS_H -#define PRIMPROC_STATS_H +#pragma once #ifndef _MSC_VER #include @@ -73,4 +72,3 @@ private: } -#endif //PRIMPROC_STATS_H diff --git a/primitives/linux-port/primitiveprocessor.h b/primitives/linux-port/primitiveprocessor.h index fc54d5371..deb4daec8 100644 --- a/primitives/linux-port/primitiveprocessor.h +++ b/primitives/linux-port/primitiveprocessor.h @@ -23,8 +23,7 @@ /** @file */ -#ifndef PRIMITIVEPROCESSOR_H_ -#define PRIMITIVEPROCESSOR_H_ +#pragma once #include #include @@ -587,6 +586,5 @@ boost::shared_ptr _parseColumnFilter( } //namespace primitives -#endif // vim:ts=4 sw=4: diff --git a/primitives/primproc/batchprimitiveprocessor.h b/primitives/primproc/batchprimitiveprocessor.h index 916c9dc77..e33d38fc8 100644 --- a/primitives/primproc/batchprimitiveprocessor.h +++ b/primitives/primproc/batchprimitiveprocessor.h @@ -28,8 +28,7 @@ // // -#ifndef BATCHPRIMITIVEPROCESSOR_H_ -#define BATCHPRIMITIVEPROCESSOR_H_ +#pragma once #include #include @@ -439,4 +438,3 @@ private: } -#endif diff --git a/primitives/primproc/bppseeder.h b/primitives/primproc/bppseeder.h index ec5c51dcb..66508790f 100644 --- a/primitives/primproc/bppseeder.h +++ b/primitives/primproc/bppseeder.h @@ -28,8 +28,7 @@ // // -#ifndef BPPSEEDER_H_ -#define BPPSEEDER_H_ +#pragma once #include #include @@ -100,4 +99,3 @@ private: }; -#endif diff --git a/primitives/primproc/bppsendthread.h b/primitives/primproc/bppsendthread.h index 16fdf7e6a..10549b3ea 100644 --- a/primitives/primproc/bppsendthread.h +++ b/primitives/primproc/bppsendthread.h @@ -29,8 +29,7 @@ #include #include -#ifndef BPPSENDTHREAD_H -#define BPPSENDTHREAD_H +#pragma once namespace primitiveprocessor { @@ -129,5 +128,4 @@ private: } -#endif diff --git a/primitives/primproc/columncommand.h b/primitives/primproc/columncommand.h index 91e4ee1da..688e82316 100644 --- a/primitives/primproc/columncommand.h +++ b/primitives/primproc/columncommand.h @@ -28,8 +28,7 @@ // // -#ifndef COLUMNCOMMAND_H_ -#define COLUMNCOMMAND_H_ +#pragma once #include "command.h" #include "calpontsystemcatalog.h" @@ -316,6 +315,5 @@ inline void ColumnCommand::fillEmptyBlock(uint } // namespace -#endif // vim:ts=4 sw=4: diff --git a/primitives/primproc/command.h b/primitives/primproc/command.h index 64a77e0c5..1ffd7e52e 100644 --- a/primitives/primproc/command.h +++ b/primitives/primproc/command.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef COMMAND_H -#define COMMAND_H +#pragma once #include #include @@ -123,4 +122,3 @@ protected: } -#endif diff --git a/primitives/primproc/dictstep.h b/primitives/primproc/dictstep.h index 0eb37ca7c..9fe7baa6d 100644 --- a/primitives/primproc/dictstep.h +++ b/primitives/primproc/dictstep.h @@ -28,8 +28,7 @@ // // -#ifndef DICTSTEP_H_ -#define DICTSTEP_H_ +#pragma once #include "command.h" #include "primitivemsg.h" @@ -157,4 +156,3 @@ private: } // namespace -#endif diff --git a/primitives/primproc/filtercommand.h b/primitives/primproc/filtercommand.h index 791c35c3e..a47994d2a 100644 --- a/primitives/primproc/filtercommand.h +++ b/primitives/primproc/filtercommand.h @@ -24,8 +24,7 @@ * class FilterCommand interface */ -#ifndef PRIMITIVES_FILTERCOMMAND_H_ -#define PRIMITIVES_FILTERCOMMAND_H_ +#pragma once #include #include @@ -168,5 +167,4 @@ private: }; -#endif // PRIMITIVES_FILTERCOMMAND_H_ diff --git a/primitives/primproc/passthrucommand.h b/primitives/primproc/passthrucommand.h index 9aae9e996..79ae926fe 100644 --- a/primitives/primproc/passthrucommand.h +++ b/primitives/primproc/passthrucommand.h @@ -28,8 +28,7 @@ // // -#ifndef PASSTHRUCOMMAND_H_ -#define PASSTHRUCOMMAND_H_ +#pragma once #include "command.h" @@ -70,4 +69,3 @@ private: } -#endif diff --git a/primitives/primproc/pp_logger.h b/primitives/primproc/pp_logger.h index fcfc18fcc..a0e080720 100644 --- a/primitives/primproc/pp_logger.h +++ b/primitives/primproc/pp_logger.h @@ -21,8 +21,7 @@ /** @file */ -#ifndef PRIMPROC_LOGGER_H_ -#define PRIMPROC_LOGGER_H_ +#pragma once #include #include @@ -68,5 +67,4 @@ private: } -#endif diff --git a/primitives/primproc/primitiveserver.h b/primitives/primproc/primitiveserver.h index 648cda187..9b369e0ef 100644 --- a/primitives/primproc/primitiveserver.h +++ b/primitives/primproc/primitiveserver.h @@ -22,8 +22,7 @@ * ***********************************************************************/ /** @file */ -#ifndef PRIMITIVESERVER_H -#define PRIMITIVESERVER_H +#pragma once #include #ifdef _MSC_VER @@ -186,4 +185,3 @@ private: } // namespace primitiveprocessor -#endif //PRIMITIVESERVER_H diff --git a/primitives/primproc/primproc.h b/primitives/primproc/primproc.h index db003cd73..da4817689 100644 --- a/primitives/primproc/primproc.h +++ b/primitives/primproc/primproc.h @@ -23,8 +23,7 @@ /** * @file */ -#ifndef PRIMPROC_H -#define PRIMPROC_H +#pragma once #include #include @@ -115,4 +114,3 @@ const int MAX_BUFFER_SIZE = 32768 * 2; extern Logger* mlp; } -#endif //PRIMPROC_H diff --git a/primitives/primproc/pseudocc.h b/primitives/primproc/pseudocc.h index d59cc3360..daaac006a 100644 --- a/primitives/primproc/pseudocc.h +++ b/primitives/primproc/pseudocc.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef PSEUDOCC_H -#define PSEUDOCC_H +#pragma once #include "columncommand.h" #include "blocksize.h" @@ -132,4 +131,3 @@ void PseudoCC::loadLBID() } -#endif // PseudoCC_H diff --git a/primitives/primproc/rtscommand.h b/primitives/primproc/rtscommand.h index 42de09b79..a38551930 100644 --- a/primitives/primproc/rtscommand.h +++ b/primitives/primproc/rtscommand.h @@ -28,8 +28,7 @@ // // -#ifndef RTSCOMMAND_H_ -#define RTSCOMMAND_H_ +#pragma once #include "command.h" #include @@ -86,4 +85,3 @@ private: } -#endif diff --git a/primitives/primproc/umsocketselector.h b/primitives/primproc/umsocketselector.h index c5be55be8..9766b8b72 100644 --- a/primitives/primproc/umsocketselector.h +++ b/primitives/primproc/umsocketselector.h @@ -27,8 +27,7 @@ * a supporting class of UmModuleIPs. */ -#ifndef UMSOCKETSELECTOR_H__ -#define UMSOCKETSELECTOR_H__ +#pragma once #ifdef _MSC_VER #define WIN32_LEAN_AND_MEAN @@ -340,4 +339,3 @@ private: } -#endif diff --git a/storage-manager/include/messageFormat.h b/storage-manager/include/messageFormat.h index aefcea4da..36f005621 100755 --- a/storage-manager/include/messageFormat.h +++ b/storage-manager/include/messageFormat.h @@ -17,8 +17,7 @@ // Defines stuff client code will use to construct messages to StorageManager. -#ifndef MESSAGEFORMAT_H_ -#define MESSAGEFORMAT_H_ +#pragma once #include #include @@ -288,5 +287,4 @@ struct copy_cmd { } -#endif diff --git a/storage-manager/src/AppendTask.h b/storage-manager/src/AppendTask.h index 4ab9d3c51..ab62e2d01 100644 --- a/storage-manager/src/AppendTask.h +++ b/storage-manager/src/AppendTask.h @@ -17,8 +17,7 @@ -#ifndef APPENDTASK_H_ -#define APPENDTASK_H_ +#pragma once #include "PosixTask.h" @@ -38,4 +37,3 @@ class AppendTask : public PosixTask }; } -#endif diff --git a/storage-manager/src/Cache.h b/storage-manager/src/Cache.h index 12396550a..81ebc47b0 100644 --- a/storage-manager/src/Cache.h +++ b/storage-manager/src/Cache.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef CACHE_H_ -#define CACHE_H_ +#pragma once /* PrefixCache manages the cache for one prefix managed by SM. Cache is a map of prefix -> Cache, and holds the items @@ -122,4 +121,3 @@ class Cache : public boost::noncopyable , public ConfigListener } -#endif diff --git a/storage-manager/src/ClientRequestProcessor.h b/storage-manager/src/ClientRequestProcessor.h index c4566d36b..a2d018344 100644 --- a/storage-manager/src/ClientRequestProcessor.h +++ b/storage-manager/src/ClientRequestProcessor.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef CLIENTREQUESTPROCESSOR_H_ -#define CLIENTREQUESTPROCESSOR_H_ +#pragma once #include "ThreadPool.h" #include @@ -42,4 +41,3 @@ class ClientRequestProcessor : public boost::noncopyable } -#endif diff --git a/storage-manager/src/CloudStorage.h b/storage-manager/src/CloudStorage.h index a844fd1e1..821484bba 100644 --- a/storage-manager/src/CloudStorage.h +++ b/storage-manager/src/CloudStorage.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef CLOUDSTORAGE_H_ -#define CLOUDSTORAGE_H_ +#pragma once #include #include @@ -58,4 +57,3 @@ class CloudStorage } -#endif diff --git a/storage-manager/src/Config.h b/storage-manager/src/Config.h index 9818ffc90..f77c1f176 100644 --- a/storage-manager/src/Config.h +++ b/storage-manager/src/Config.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef CONFIG_H_ -#define CONFIG_H_ +#pragma once #include #include @@ -73,4 +72,3 @@ class Config : public boost::noncopyable } -#endif diff --git a/storage-manager/src/CopyTask.h b/storage-manager/src/CopyTask.h index f33e9bf23..0641ac43f 100644 --- a/storage-manager/src/CopyTask.h +++ b/storage-manager/src/CopyTask.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef COPYTASK_H_ -#define COPYTASK_H_ +#pragma once #include "PosixTask.h" @@ -38,4 +37,3 @@ class CopyTask : public PosixTask } -#endif diff --git a/storage-manager/src/Downloader.h b/storage-manager/src/Downloader.h index 0c2e73410..f23dbe33b 100644 --- a/storage-manager/src/Downloader.h +++ b/storage-manager/src/Downloader.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef DOWNLOADER_H_ -#define DOWNLOADER_H_ +#pragma once #include "ThreadPool.h" #include "CloudStorage.h" @@ -113,4 +112,3 @@ class Downloader : public ConfigListener } -#endif diff --git a/storage-manager/src/IOCoordinator.h b/storage-manager/src/IOCoordinator.h index 1783f6a76..a24462db7 100644 --- a/storage-manager/src/IOCoordinator.h +++ b/storage-manager/src/IOCoordinator.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef IOCOORDINATOR_H_ -#define IOCOORDINATOR_H_ +#pragma once #include #include @@ -133,4 +132,3 @@ class IOCoordinator : public boost::noncopyable } -#endif diff --git a/storage-manager/src/ListDirectoryTask.h b/storage-manager/src/ListDirectoryTask.h index e2180a452..040031512 100644 --- a/storage-manager/src/ListDirectoryTask.h +++ b/storage-manager/src/ListDirectoryTask.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef LIST_DIRECTORYTASK_H_ -#define LIST_DIRECTORYTASK_H_ +#pragma once #include "PosixTask.h" #include @@ -41,4 +40,3 @@ class ListDirectoryTask : public PosixTask } -#endif diff --git a/storage-manager/src/LocalStorage.h b/storage-manager/src/LocalStorage.h index 5185241e8..b13b2bd88 100644 --- a/storage-manager/src/LocalStorage.h +++ b/storage-manager/src/LocalStorage.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef LOCALSTORAGE_H_ -#define LOCALSTORAGE_H_ +#pragma once #include #include "CloudStorage.h" @@ -59,4 +58,3 @@ class LocalStorage : public CloudStorage } -#endif diff --git a/storage-manager/src/MetadataFile.h b/storage-manager/src/MetadataFile.h index 38a36c006..bc8579290 100644 --- a/storage-manager/src/MetadataFile.h +++ b/storage-manager/src/MetadataFile.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef METADATAFILE_H_ -#define METADATAFILE_H_ +#pragma once #include "Config.h" #include "SMLogging.h" @@ -142,4 +141,3 @@ class MetadataFile } -#endif /* METADATAFILE_H_ */ diff --git a/storage-manager/src/OpenTask.h b/storage-manager/src/OpenTask.h index 4c2524c55..84d1dee90 100644 --- a/storage-manager/src/OpenTask.h +++ b/storage-manager/src/OpenTask.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef OPENTASK_H_ -#define OPENTASK_H_ +#pragma once #include "PosixTask.h" @@ -38,4 +37,3 @@ class OpenTask : public PosixTask } -#endif diff --git a/storage-manager/src/Ownership.h b/storage-manager/src/Ownership.h index 5327c940e..5ef1e9c16 100644 --- a/storage-manager/src/Ownership.h +++ b/storage-manager/src/Ownership.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef OWNERSHIP_H_ -#define OWNERSHIP_H_ +#pragma once #include #include @@ -77,4 +76,3 @@ inline bool Ownership::sharedFS() } -#endif diff --git a/storage-manager/src/PingTask.h b/storage-manager/src/PingTask.h index 735ad8828..45311a6bf 100644 --- a/storage-manager/src/PingTask.h +++ b/storage-manager/src/PingTask.h @@ -17,8 +17,7 @@ -#ifndef PINGTASK_H_ -#define PINGTASK_H_ +#pragma once #include "PosixTask.h" @@ -38,4 +37,3 @@ class PingTask : public PosixTask }; } -#endif diff --git a/storage-manager/src/PosixTask.h b/storage-manager/src/PosixTask.h index c8025eb88..49f341b6e 100644 --- a/storage-manager/src/PosixTask.h +++ b/storage-manager/src/PosixTask.h @@ -17,8 +17,7 @@ -#ifndef POSIX_TASK_H_ -#define POSIX_TASK_H_ +#pragma once #include #include @@ -66,4 +65,3 @@ class PosixTask }; } -#endif diff --git a/storage-manager/src/PrefixCache.h b/storage-manager/src/PrefixCache.h index 1121275c7..29327a535 100644 --- a/storage-manager/src/PrefixCache.h +++ b/storage-manager/src/PrefixCache.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef PREFIXCACHE_H_ -#define PREFIXCACHE_H_ +#pragma once /* PrefixCache manages the cache for one prefix managed by SM. Cache is a map of prefix -> PrefixCache, and holds the items @@ -167,4 +166,3 @@ class PrefixCache : public boost::noncopyable } -#endif diff --git a/storage-manager/src/ProcessTask.h b/storage-manager/src/ProcessTask.h index a9b1008aa..85a18ddbd 100644 --- a/storage-manager/src/ProcessTask.h +++ b/storage-manager/src/ProcessTask.h @@ -17,8 +17,7 @@ -#ifndef PROCESS_TASK_H_ -#define PROCESS_TASK_H_ +#pragma once #include "ThreadPool.h" @@ -49,4 +48,3 @@ class ProcessTask : public ThreadPool::Job -#endif diff --git a/storage-manager/src/ReadTask.h b/storage-manager/src/ReadTask.h index db0eeb35a..d0dd83387 100644 --- a/storage-manager/src/ReadTask.h +++ b/storage-manager/src/ReadTask.h @@ -17,8 +17,7 @@ -#ifndef READTASK_H_ -#define READTASK_H_ +#pragma once #include "PosixTask.h" @@ -38,4 +37,3 @@ class ReadTask : public PosixTask }; } -#endif diff --git a/storage-manager/src/Replicator.h b/storage-manager/src/Replicator.h index 4cf96ac92..40b5e46e9 100644 --- a/storage-manager/src/Replicator.h +++ b/storage-manager/src/Replicator.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef REPLICATOR_H_ -#define REPLICATOR_H_ +#pragma once //#include "ThreadPool.h" #include "MetadataFile.h" @@ -76,4 +75,3 @@ class Replicator } -#endif diff --git a/storage-manager/src/S3Storage.h b/storage-manager/src/S3Storage.h index 8c79d141b..e7b1df16e 100644 --- a/storage-manager/src/S3Storage.h +++ b/storage-manager/src/S3Storage.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef S3STORAGE_H_ -#define S3STORAGE_H_ +#pragma once #include #include @@ -95,4 +94,3 @@ class S3Storage : public CloudStorage } -#endif diff --git a/storage-manager/src/SMLogging.h b/storage-manager/src/SMLogging.h index 769fe29b0..8be2e6901 100644 --- a/storage-manager/src/SMLogging.h +++ b/storage-manager/src/SMLogging.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef SM_LOGGING_H_ -#define SM_LOGGING_H_ +#pragma once #include #include @@ -43,4 +42,3 @@ class SMLogging } -#endif diff --git a/storage-manager/src/SessionManager.h b/storage-manager/src/SessionManager.h index 5ba06666a..350390ed8 100644 --- a/storage-manager/src/SessionManager.h +++ b/storage-manager/src/SessionManager.h @@ -17,8 +17,7 @@ -#ifndef STORAGEMANGER_H_ -#define STORAGEMANGER_H_ +#pragma once #include "ClientRequestProcessor.h" #include "messageFormat.h" @@ -79,4 +78,3 @@ private: } -#endif diff --git a/storage-manager/src/StatTask.h b/storage-manager/src/StatTask.h index 1920d07dd..0ddaf04db 100644 --- a/storage-manager/src/StatTask.h +++ b/storage-manager/src/StatTask.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef STATTASK_H_ -#define STATTASK_H_ +#pragma once #include "PosixTask.h" @@ -38,4 +37,3 @@ class StatTask : public PosixTask } -#endif diff --git a/storage-manager/src/SyncTask.h b/storage-manager/src/SyncTask.h index c6b3a4abe..162cfcbca 100644 --- a/storage-manager/src/SyncTask.h +++ b/storage-manager/src/SyncTask.h @@ -17,8 +17,7 @@ -#ifndef SYNCTASK_H_ -#define SYNCTASK_H_ +#pragma once #include "PosixTask.h" @@ -38,4 +37,3 @@ class SyncTask : public PosixTask }; } -#endif diff --git a/storage-manager/src/Synchronizer.h b/storage-manager/src/Synchronizer.h index a11dc4131..f3cf86a1f 100644 --- a/storage-manager/src/Synchronizer.h +++ b/storage-manager/src/Synchronizer.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef SYNCHRONIZER_H_ -#define SYNCHRONIZER_H_ +#pragma once #include #include @@ -138,4 +137,3 @@ class Synchronizer : public boost::noncopyable , public ConfigListener }; } -#endif diff --git a/storage-manager/src/ThreadPool.h b/storage-manager/src/ThreadPool.h index 651ca8110..d29bdac75 100644 --- a/storage-manager/src/ThreadPool.h +++ b/storage-manager/src/ThreadPool.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef SM_THREADPOOL_H_ -#define SM_THREADPOOL_H_ +#pragma once #include #include @@ -91,4 +90,3 @@ class ThreadPool : public boost::noncopyable } -#endif diff --git a/storage-manager/src/TruncateTask.h b/storage-manager/src/TruncateTask.h index 664f674c5..f5591fdce 100644 --- a/storage-manager/src/TruncateTask.h +++ b/storage-manager/src/TruncateTask.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef TRUNCATETASK_H_ -#define TRUNCATETASK_H_ +#pragma once #include "PosixTask.h" @@ -38,4 +37,3 @@ class TruncateTask : public PosixTask } -#endif diff --git a/storage-manager/src/UnlinkTask.h b/storage-manager/src/UnlinkTask.h index 856b6da8a..36a3a44b0 100644 --- a/storage-manager/src/UnlinkTask.h +++ b/storage-manager/src/UnlinkTask.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef UNLINKTASK_H_ -#define UNLINKTASK_H_ +#pragma once #include "PosixTask.h" @@ -38,4 +37,3 @@ class UnlinkTask : public PosixTask } -#endif diff --git a/storage-manager/src/Utilities.h b/storage-manager/src/Utilities.h index fe7a6c93c..35af59882 100644 --- a/storage-manager/src/Utilities.h +++ b/storage-manager/src/Utilities.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef UTILITIES_H_ -#define UTILITIES_H_ +#pragma once #include @@ -85,4 +84,3 @@ class SharedCloser } -#endif diff --git a/storage-manager/src/WriteTask.h b/storage-manager/src/WriteTask.h index 399368328..6e624e8ef 100644 --- a/storage-manager/src/WriteTask.h +++ b/storage-manager/src/WriteTask.h @@ -17,8 +17,7 @@ -#ifndef WRITETASK_H_ -#define WRITETASK_H_ +#pragma once #include "PosixTask.h" @@ -38,4 +37,3 @@ class WriteTask : public PosixTask }; } -#endif diff --git a/tests/col16block.h b/tests/col16block.h index 67f68b496..223ce434d 100644 --- a/tests/col16block.h +++ b/tests/col16block.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef HAVE_COL16BLOCK -#define HAVE_COL16BLOCK +#pragma once unsigned char ___bin_col16block_cdf[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -705,4 +704,3 @@ unsigned char ___bin_col16block_cdf[] = { unsigned int ___bin_col16block_cdf_len = 8192; constexpr int __col16block_cdf_umin = 2; constexpr int __col16block_cdf_umax = 511; -#endif diff --git a/tests/col1block.h b/tests/col1block.h index ab836f243..68d8da800 100644 --- a/tests/col1block.h +++ b/tests/col1block.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef HAVE_COL1BLOCK -#define HAVE_COL1BLOCK +#pragma once unsigned char __col1block_cdf[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, @@ -705,4 +704,3 @@ unsigned char __col1block_cdf[] = { unsigned int __col1block_cdf_len = 8192; constexpr int __col1block_cdf_umin = -126; constexpr int __col1block_cdf_umax = 127; -#endif diff --git a/tests/col2block.h b/tests/col2block.h index 3637654a0..bc78eff30 100644 --- a/tests/col2block.h +++ b/tests/col2block.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef HAVE_COL2BLOCK -#define HAVE_COL2BLOCK +#pragma once unsigned char __col2block_cdf[] = { 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08, 0x00, 0x09, 0x00, 0x0a, 0x00, 0x0b, 0x00, @@ -705,4 +704,3 @@ unsigned char __col2block_cdf[] = { unsigned int __col2block_cdf_len = 8192; constexpr int __col2block_cdf_umin = 0; constexpr int __col2block_cdf_umax = 4095; -#endif diff --git a/tests/col4block.h b/tests/col4block.h index b9dde31a6..728b90efa 100644 --- a/tests/col4block.h +++ b/tests/col4block.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef HAVE_COL4BLOCK -#define HAVE_COL4BLOCK +#pragma once unsigned char __col4block_cdf[] = { 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, @@ -705,4 +704,3 @@ unsigned char __col4block_cdf[] = { unsigned int __col4block_cdf_len = 8192; constexpr int __col4block_cdf_umin = 0; constexpr int __col4block_cdf_umax = 2047; -#endif diff --git a/tests/col8block.h b/tests/col8block.h index 7cf0de38a..38eaf676e 100644 --- a/tests/col8block.h +++ b/tests/col8block.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef HAVE_COL8BLOCK -#define HAVE_COL8BLOCK +#pragma once unsigned char ___bin_col8block_cdf[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -705,4 +704,3 @@ unsigned char ___bin_col8block_cdf[] = { unsigned int ___bin_col8block_cdf_len = 8192; constexpr int __col8block_cdf_umin = 0; constexpr int __col8block_cdf_umax = 1023; -#endif diff --git a/tests/col_double_block.h b/tests/col_double_block.h index af1267b78..307ba435d 100644 --- a/tests/col_double_block.h +++ b/tests/col_double_block.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef HAVE_COL_DOUBLE_BLOCK -#define HAVE_COL_DOUBLE_BLOCK +#pragma once unsigned char ___bin_col_double_block_cdf[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x40, @@ -703,5 +702,4 @@ unsigned char ___bin_col_double_block_cdf[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x80, 0x40 }; unsigned int ___bin_col_double_block_cdf_len = 8192; -#endif diff --git a/tests/col_float_block.h b/tests/col_float_block.h index 8f6b577b6..274208721 100644 --- a/tests/col_float_block.h +++ b/tests/col_float_block.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef HAVE_COL_FLOAT_BLOCK -#define HAVE_COL_FLOAT_BLOCK +#pragma once unsigned char ___bin_col_float_block_cdf[] = { 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x20, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x60, 0x40, 0x00, 0x00, 0x80, 0x40, @@ -703,4 +702,3 @@ unsigned char ___bin_col_float_block_cdf[] = { 0x00, 0x10, 0x80, 0x44, 0x00, 0x20, 0x80, 0x44 }; unsigned int ___bin_col_float_block_cdf_len = 8192; -#endif diff --git a/tests/col_neg_double.h b/tests/col_neg_double.h index 7f0607e4b..29be33a58 100644 --- a/tests/col_neg_double.h +++ b/tests/col_neg_double.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef HAVE_COL_NEG_DOUBLE -#define HAVE_COL_NEG_DOUBLE +#pragma once unsigned char ___bin_col_neg_double_cdf[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x25, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0xc0, @@ -703,5 +702,4 @@ unsigned char ___bin_col_neg_double_cdf[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x7f, 0x40 }; unsigned int ___bin_col_neg_double_cdf_len = 8192; -#endif diff --git a/tests/col_neg_float.h b/tests/col_neg_float.h index 203893379..2b95e518c 100644 --- a/tests/col_neg_float.h +++ b/tests/col_neg_float.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef HAVE_COL_NEG_FLOAT -#define HAVE_COL_NEG_FLOAT +#pragma once unsigned char ___bin_col_neg_float_cdf[] = { 0x00, 0x00, 0x28, 0xc1, 0x00, 0x00, 0x20, 0xc1, 0x00, 0x00, 0x18, 0xc1, 0x00, 0x00, 0x10, 0xc1, 0x00, 0x00, 0x08, 0xc1, 0x00, 0x00, 0x00, 0xc1, @@ -703,4 +702,3 @@ unsigned char ___bin_col_neg_float_cdf[] = { 0x00, 0x20, 0x7d, 0x44, 0x00, 0x40, 0x7d, 0x44 }; unsigned int ___bin_col_neg_float_cdf_len = 8192; -#endif diff --git a/tools/cleartablelock/cleartablelockthread.h b/tools/cleartablelock/cleartablelockthread.h index 37c1b98fc..61ad43334 100644 --- a/tools/cleartablelock/cleartablelockthread.h +++ b/tools/cleartablelock/cleartablelockthread.h @@ -19,8 +19,7 @@ * $Id: cleartablelockthread.h 2101 2013-01-21 14:12:52Z rdempsey $ * *******************************************************************************/ -#ifndef ClearTableLockThread_H__ -#define ClearTableLockThread_H__ +#pragma once #include @@ -134,4 +133,3 @@ private: static boost::mutex fStdOutLock; // Synchronize logging to stdout }; -#endif diff --git a/tools/dbbuilder/dbbuilder.h b/tools/dbbuilder/dbbuilder.h index b0578ebff..35a25557c 100644 --- a/tools/dbbuilder/dbbuilder.h +++ b/tools/dbbuilder/dbbuilder.h @@ -22,8 +22,7 @@ /** * @file */ -#ifndef DBBUILDER_H -#define DBBUILDER_H +#pragma once #include #include @@ -58,4 +57,3 @@ #include "messagelog.h" #include "liboamcpp.h" -#endif //DBBUILDER_H diff --git a/tools/dbbuilder/systemcatalog.h b/tools/dbbuilder/systemcatalog.h index 23798df84..ba1c99220 100644 --- a/tools/dbbuilder/systemcatalog.h +++ b/tools/dbbuilder/systemcatalog.h @@ -20,8 +20,7 @@ /** * @file */ -#ifndef SYSTEMCATALOG_H -#define SYSTEMCATALOG_H +#pragma once #include "writeengine.h" @@ -38,4 +37,3 @@ private: -#endif //SYSTEMCATLOG_H diff --git a/tools/dbbuilder/tpchpopulate.h b/tools/dbbuilder/tpchpopulate.h index 1668d5f92..79ac11195 100644 --- a/tools/dbbuilder/tpchpopulate.h +++ b/tools/dbbuilder/tpchpopulate.h @@ -22,8 +22,7 @@ /** * @file */ -#ifndef TPCHPOPULATE_H -#define TPCHPOPULATE_H +#pragma once class TpchPopulate { @@ -41,4 +40,3 @@ private: }; -#endif //TPCHPOPULATE_H diff --git a/tools/dbbuilder/tpchschema.h b/tools/dbbuilder/tpchschema.h index 01408c731..05190f8c6 100644 --- a/tools/dbbuilder/tpchschema.h +++ b/tools/dbbuilder/tpchschema.h @@ -22,8 +22,7 @@ /** * @file */ -#ifndef TPCHSCHEMA_H -#define TPCHSCHEMA_H +#pragma once class TpchSchema { @@ -42,4 +41,3 @@ private: void createindex(std::string createText); }; -#endif //TPCHSCHEMA_H diff --git a/tools/dbloadxml/inputmgr.h b/tools/dbloadxml/inputmgr.h index 815b8d7cd..3337e534a 100644 --- a/tools/dbloadxml/inputmgr.h +++ b/tools/dbloadxml/inputmgr.h @@ -20,8 +20,7 @@ * ***********************************************************************/ /** @file */ -#ifndef INPUTMGR_H -#define INPUTMGR_H +#pragma once #include #include "we_xmlgendata.h" @@ -67,4 +66,3 @@ private: } -#endif diff --git a/tools/dmldriver/dmlif.h b/tools/dmldriver/dmlif.h index 2c935d69e..5f08e5d12 100644 --- a/tools/dmldriver/dmlif.h +++ b/tools/dmldriver/dmlif.h @@ -17,8 +17,7 @@ // $Id: dmlif.h 2101 2013-01-21 14:12:52Z rdempsey $ -#ifndef DMLIF_H__ -#define DMLIF_H__ +#pragma once #include #include @@ -66,5 +65,4 @@ private: } -#endif diff --git a/tools/dmldriver/tpchrf2.h b/tools/dmldriver/tpchrf2.h index 43bb79f0f..350f8b012 100644 --- a/tools/dmldriver/tpchrf2.h +++ b/tools/dmldriver/tpchrf2.h @@ -17,8 +17,7 @@ // $Id: tpchrf2.h 2101 2013-01-21 14:12:52Z rdempsey $ -#ifndef TPCHRF2_H__ -#define TPCHRF2_H__ +#pragma once #include #include @@ -53,4 +52,3 @@ private: } -#endif diff --git a/tools/qfe/bison-win.h b/tools/qfe/bison-win.h index 904821ea9..6ee5af33f 100644 --- a/tools/qfe/bison-win.h +++ b/tools/qfe/bison-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 @@ -79,7 +78,6 @@ typedef union YYSTYPE # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -#endif extern YYSTYPE qfelval; diff --git a/tools/qfe/cseputils.h b/tools/qfe/cseputils.h index 5ac622757..a352ff120 100644 --- a/tools/qfe/cseputils.h +++ b/tools/qfe/cseputils.h @@ -1,5 +1,4 @@ -#ifndef QFE_CSEPUTILS_H__ -#define QFE_CSEPUTILS_H__ +#pragma once #include @@ -42,5 +41,4 @@ void updateParseTree(boost::shared_ptr&, } //namespace qfe::utils } //namespace qfe -#endif diff --git a/tools/qfe/ddlstmts.h b/tools/qfe/ddlstmts.h index c3f02a3ef..ac7c332e6 100644 --- a/tools/qfe/ddlstmts.h +++ b/tools/qfe/ddlstmts.h @@ -1,5 +1,4 @@ -#ifndef QFE_DDLSTMTS_H__ -#define QFE_DDLSTMTS_H__ +#pragma once #include #include @@ -10,5 +9,4 @@ void processCreateStmt(const std::string&, uint32_t); void processDropStmt(const std::string&, uint32_t); } -#endif diff --git a/tools/qfe/parsequery.h b/tools/qfe/parsequery.h index afd64580a..850fee3b5 100644 --- a/tools/qfe/parsequery.h +++ b/tools/qfe/parsequery.h @@ -1,5 +1,4 @@ -#ifndef QFE_PARSEQUERY_H__ -#define QFE_PARSEQUERY_H__ +#pragma once #include #include @@ -13,4 +12,3 @@ execplan::CalpontSelectExecutionPlan* parseQuery(const std::string&, uint32_t); } -#endif diff --git a/tools/qfe/returnedrows.h b/tools/qfe/returnedrows.h index ce4a4e520..dd928a349 100644 --- a/tools/qfe/returnedrows.h +++ b/tools/qfe/returnedrows.h @@ -1,5 +1,4 @@ -#ifndef QFE_RETURNEDROWS_H__ -#define QFE_RETURNEDROWS_H__ +#pragma once #include "socktype.h" #include "messagequeue.h" @@ -11,5 +10,4 @@ void processReturnedRows(messageqcpp::MessageQueueClient*, SockType); } -#endif diff --git a/tools/qfe/sendcsep.h b/tools/qfe/sendcsep.h index 47ba28485..445007b3f 100644 --- a/tools/qfe/sendcsep.h +++ b/tools/qfe/sendcsep.h @@ -1,5 +1,4 @@ -#ifndef QFE_SENDCSEP_H__ -#define QFE_SENDCSEP_H__ +#pragma once #include "messagequeue.h" #include "calpontselectexecutionplan.h" @@ -13,5 +12,4 @@ messageqcpp::MessageQueueClient* sendCSEP(execplan::CalpontSelectExecutionPlan*) } -#endif diff --git a/tools/qfe/socketio.h b/tools/qfe/socketio.h index b673ab462..e0278b7d2 100644 --- a/tools/qfe/socketio.h +++ b/tools/qfe/socketio.h @@ -1,5 +1,4 @@ -#ifndef QFE_SOCKETIO_H__ -#define QFE_SOCKETIO_H__ +#pragma once #ifdef _MSC_VER #define WIN32_LEAN_AND_MEAN @@ -32,5 +31,4 @@ void writeString(SockType, const std::string&); } //namespace qfe::socketio } //namespace qfe -#endif diff --git a/tools/qfe/socktype.h b/tools/qfe/socktype.h index ba832699b..83bfa6ec3 100644 --- a/tools/qfe/socktype.h +++ b/tools/qfe/socktype.h @@ -1,5 +1,4 @@ -#ifndef QFE_SOCKTYPE_H__ -#define QFE_SOCKTYPE_H__ +#pragma once #ifdef _MSC_VER #define WIN32_LEAN_AND_MEAN @@ -17,5 +16,4 @@ typedef int SockType; #define SockWriteFcn qfe::socketio::writen #endif -#endif diff --git a/tools/rebuildEM/BRM_saves_em_system_tables_blob.h b/tools/rebuildEM/BRM_saves_em_system_tables_blob.h index d25eaa222..252688c8b 100644 --- a/tools/rebuildEM/BRM_saves_em_system_tables_blob.h +++ b/tools/rebuildEM/BRM_saves_em_system_tables_blob.h @@ -1,5 +1,4 @@ -#ifndef BRM_SAVES_EM_SYSTEM_TABLES_BLOB -#define BRM_SAVES_EM_SYSTEM_TABLES_BLOB +#pragma once // Generated by hexdump -C BRM_saves_em for initial system catalog. // TODO: This could be compressed by simple `run-length encoding` @@ -337,4 +336,3 @@ static const uint8_t BRM_saves_em_system_tables_blob[] = { 0x00, 0x94, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -#endif diff --git a/tools/rebuildEM/rebuildEM.h b/tools/rebuildEM/rebuildEM.h index 481a2e102..b733ca597 100644 --- a/tools/rebuildEM/rebuildEM.h +++ b/tools/rebuildEM/rebuildEM.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef REBUILD_EM_H -#define REBUILD_EM_H +#pragma once #include #include @@ -228,4 +227,3 @@ class ChunkManagerWrapperDict : public ChunkManagerWrapper }; } // namespace RebuildExtentMap -#endif diff --git a/utils/batchloader/batchloader.h b/utils/batchloader/batchloader.h index 56789b7f5..ebe45db3b 100644 --- a/utils/batchloader/batchloader.h +++ b/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 #include "oamcache.h" @@ -130,4 +129,3 @@ private: #undef EXPORT -#endif // WE_DBROOTEXTENTTRACKER_H_ diff --git a/utils/cacheutils/cacheutils.h b/utils/cacheutils/cacheutils.h index 700970da5..fe030dd3a 100644 --- a/utils/cacheutils/cacheutils.h +++ b/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 files, const int pmId) } // vim:ts=4 sw=4: -#endif diff --git a/utils/cloudio/SMComm.h b/utils/cloudio/SMComm.h index d7240e73a..81e030b67 100644 --- a/utils/cloudio/SMComm.h +++ b/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 #include @@ -77,4 +76,3 @@ class SMComm : public boost::noncopyable } -#endif diff --git a/utils/cloudio/SMDataFile.h b/utils/cloudio/SMDataFile.h index b83de0238..98c241e12 100644 --- a/utils/cloudio/SMDataFile.h +++ b/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 #include @@ -58,4 +57,3 @@ class SMDataFile : public IDBDataFile } -#endif diff --git a/utils/cloudio/SMFileFactory.h b/utils/cloudio/SMFileFactory.h index 0ee0b7fba..f9071e0e5 100644 --- a/utils/cloudio/SMFileFactory.h +++ b/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 diff --git a/utils/cloudio/SMFileSystem.h b/utils/cloudio/SMFileSystem.h index 4b136a2fd..5a8528ca1 100644 --- a/utils/cloudio/SMFileSystem.h +++ b/utils/cloudio/SMFileSystem.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ -#ifndef SMFILESYSTEM_H_ -#define SMFILESYSTEM_H_ +#pragma once #include #include @@ -50,4 +49,3 @@ class SMFileSystem : public IDBFileSystem, boost::noncopyable } -#endif diff --git a/utils/cloudio/SocketPool.h b/utils/cloudio/SocketPool.h index 79d34011e..be0670521 100644 --- a/utils/cloudio/SocketPool.h +++ b/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 #include @@ -56,4 +55,3 @@ class SocketPool : public boost::noncopyable -#endif diff --git a/utils/cloudio/sm_exceptions.h b/utils/cloudio/sm_exceptions.h index 206ce0c37..6a188d815 100644 --- a/utils/cloudio/sm_exceptions.h +++ b/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 @@ -36,4 +35,3 @@ NotImplementedYet::NotImplementedYet(const std::string &s) : } } -#endif diff --git a/utils/common/MonitorProcMem.h b/utils/common/MonitorProcMem.h index 7a28c5971..da2d1dbe2 100644 --- a/utils/common/MonitorProcMem.h +++ b/utils/common/MonitorProcMem.h @@ -24,8 +24,7 @@ * */ -#ifndef MonitorProcMem_H__ -#define MonitorProcMem_H__ +#pragma once #include #include @@ -127,4 +126,3 @@ protected: } -#endif diff --git a/utils/common/atomicops.h b/utils/common/atomicops.h index f2ec85fbf..aacdc1bae 100644 --- a/utils/common/atomicops.h +++ b/utils/common/atomicops.h @@ -17,8 +17,7 @@ /** @file */ -#ifndef COMMON_ATOMICOPS_H__ -#define COMMON_ATOMICOPS_H__ +#pragma once #include #if defined(__linux__) @@ -177,4 +176,3 @@ inline void atomicYield() } -#endif diff --git a/utils/common/branchpred.h b/utils/common/branchpred.h index f345fd9a9..1c7fb2b81 100644 --- a/utils/common/branchpred.h +++ b/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 diff --git a/utils/common/cgroupconfigurator.h b/utils/common/cgroupconfigurator.h index b7b5af20d..7b2a22bbb 100644 --- a/utils/common/cgroupconfigurator.h +++ b/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 #include @@ -73,4 +72,3 @@ private: } -#endif // CGROUPCONFIGURATOR_H diff --git a/utils/common/checks.h b/utils/common/checks.h index fb4a94e94..542e19d58 100644 --- a/utils/common/checks.h +++ b/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 #include "mcs_int128.h" @@ -48,4 +47,3 @@ is_negative(T v) { return v < 0; }; } // namespace utils -#endif // UTILS_COMMON_CHECKS_H diff --git a/utils/common/collation.h b/utils/common/collation.h index 16ae79d07..bbfdc94f0 100644 --- a/utils/common/collation.h +++ b/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 diff --git a/utils/common/columnwidth.h b/utils/common/columnwidth.h index 9d02a7312..59c88f4a6 100644 --- a/utils/common/columnwidth.h +++ b/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 diff --git a/utils/common/conststring.h b/utils/common/conststring.h index 685900aac..8c9eaf9ce 100644 --- a/utils/common/conststring.h +++ b/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 diff --git a/utils/common/fixedallocator.h b/utils/common/fixedallocator.h index 9e716a133..42337dcbc 100644 --- a/utils/common/fixedallocator.h +++ b/utils/common/fixedallocator.h @@ -30,8 +30,7 @@ TODO: make it STL and boost compliant... */ -#ifndef FIXEDALLOCATOR_H_ -#define FIXEDALLOCATOR_H_ +#pragma once #include #include @@ -139,4 +138,3 @@ inline void* FixedAllocator::allocate(uint32_t len) #undef EXPORT } // namespace -#endif diff --git a/utils/common/genericparser.h b/utils/common/genericparser.h index 2e23d9568..955f14254 100644 --- a/utils/common/genericparser.h +++ b/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 diff --git a/utils/common/hasher.h b/utils/common/hasher.h index cd2ef210e..b2f98b689 100644 --- a/utils/common/hasher.h +++ b/utils/common/hasher.h @@ -24,8 +24,7 @@ * class Hasher interface */ -#ifndef UTILS_HASHER_H -#define UTILS_HASHER_H +#pragma once #include #include @@ -405,4 +404,3 @@ private: } -#endif // UTILS_HASHER_H diff --git a/utils/common/hashfamily.h b/utils/common/hashfamily.h index b324ea856..47d4d60d4 100644 --- a/utils/common/hashfamily.h +++ b/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: diff --git a/utils/common/mariadb_my_sys.h b/utils/common/mariadb_my_sys.h index 409e1e683..256aea6ae 100644 --- a/utils/common/mariadb_my_sys.h +++ b/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 diff --git a/utils/common/mcs_basic_types.h b/utils/common/mcs_basic_types.h index 131fcdc68..6232bd7f5 100644 --- a/utils/common/mcs_basic_types.h +++ b/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: diff --git a/utils/common/nullvaluemanip.h b/utils/common/nullvaluemanip.h index 307665e7c..3c3eb38ce 100644 --- a/utils/common/nullvaluemanip.h +++ b/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 diff --git a/utils/common/pipe.h b/utils/common/pipe.h index 427f17ac0..4d62eb612 100644 --- a/utils/common/pipe.h +++ b/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 diff --git a/utils/common/poolallocator.h b/utils/common/poolallocator.h index d02db5d55..86c2f03b5 100644 --- a/utils/common/poolallocator.h +++ b/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 #include @@ -132,4 +131,3 @@ inline void* PoolAllocator::allocate(uint64_t size) } -#endif diff --git a/utils/common/robin_hood.h b/utils/common/robin_hood.h index 5304ca53c..cf0c7b8b8 100644 --- a/utils/common/robin_hood.h +++ b/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 #include "pipe.h" @@ -113,4 +112,3 @@ public: virtual int Child()= 0; }; -#endif // SERVICE_H_INCLUDED diff --git a/utils/common/simd_sse.h b/utils/common/simd_sse.h index 494deaa2e..3fb2f6043 100644 --- a/utils/common/simd_sse.h +++ b/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: diff --git a/utils/common/simpleallocator.h b/utils/common/simpleallocator.h index 987c57387..a6156ef3b 100644 --- a/utils/common/simpleallocator.h +++ b/utils/common/simpleallocator.h @@ -24,8 +24,7 @@ * class SimpleAllocator interface */ -#ifndef UTILS_SIMPLEALLOCATOR_H -#define UTILS_SIMPLEALLOCATOR_H +#pragma once #include #include @@ -256,5 +255,4 @@ inline bool operator!=(const SimpleAllocator&, const SimpleAllocator&) } } -#endif // UTILS_SIMPLEALLOCATOR_H diff --git a/utils/common/statistics.h b/utils/common/statistics.h index 2c7dbe95b..6b8591810 100644 --- a/utils/common/statistics.h +++ b/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 diff --git a/utils/common/stlpoolallocator.h b/utils/common/stlpoolallocator.h index 650d4e79f..497eda970 100644 --- a/utils/common/stlpoolallocator.h +++ b/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&, const STLPoolAllocator&) } -#endif diff --git a/utils/common/syncstream.h b/utils/common/syncstream.h index 001c02dbb..c5a9398e7 100644 --- a/utils/common/syncstream.h +++ b/utils/common/syncstream.h @@ -55,8 +55,7 @@ main() } */ -#ifndef SYNCSTREAM_H__ -#define SYNCSTREAM_H__ +#pragma once #include #include @@ -148,5 +147,4 @@ private: } -#endif diff --git a/utils/common/threadnaming.h b/utils/common/threadnaming.h index 486cd168a..ee42bfade 100644 --- a/utils/common/threadnaming.h +++ b/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 @@ -24,4 +23,3 @@ namespace utils void setThreadName(const char *threadName); std::string getThreadName(); } // end of namespace -#endif diff --git a/utils/common/utils_utf8.h b/utils/common/utils_utf8.h index 75123e460..42a7be6dd 100644 --- a/utils/common/utils_utf8.h +++ b/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 diff --git a/utils/common/vlarray.h b/utils/common/vlarray.h index c803046c0..bd483e5ce 100644 --- a/utils/common/vlarray.h +++ b/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 diff --git a/utils/common/widedecimalutils.h b/utils/common/widedecimalutils.h index ae70d275c..a962611e3 100644 --- a/utils/common/widedecimalutils.h +++ b/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 #include "mcs_basic_types.h" @@ -46,4 +45,3 @@ namespace utils } } -#endif // WIDE_DECIMAL_UTILS_H diff --git a/utils/compress/idbcompress.h b/utils/compress/idbcompress.h index 23c02f966..68ca9655c 100644 --- a/utils/compress/idbcompress.h +++ b/utils/compress/idbcompress.h @@ -17,8 +17,7 @@ /** @file */ -#ifndef IDBCOMPRESS_H__ -#define IDBCOMPRESS_H__ +#pragma once #include #ifdef __linux__ @@ -518,5 +517,4 @@ CompressInterface* getCompressInterfaceByType(uint32_t compressionType, #undef EXPORT -#endif diff --git a/utils/configcpp/configcpp.h b/utils/configcpp/configcpp.h index 57e90bc20..5eddf22d6 100644 --- a/utils/configcpp/configcpp.h +++ b/utils/configcpp/configcpp.h @@ -22,8 +22,7 @@ /** * @file */ -#ifndef CONFIG_CONFIGCPP_H -#define CONFIG_CONFIGCPP_H +#pragma once #include #include @@ -258,6 +257,5 @@ private: #undef EXPORT -#endif // vim:ts=4 sw=4: diff --git a/utils/configcpp/configstream.h b/utils/configcpp/configstream.h index fd6ffcba5..b1ae5e0a7 100644 --- a/utils/configcpp/configstream.h +++ b/utils/configcpp/configstream.h @@ -22,8 +22,7 @@ /** * @file */ -#ifndef CONFIG_CONFIGSTREAM_H_ -#define CONFIG_CONFIGSTREAM_H_ +#pragma once #include #include @@ -63,6 +62,5 @@ private: } //namespace -#endif // vim:ts=4 sw=4: diff --git a/utils/configcpp/md5/md5.h b/utils/configcpp/md5/md5.h index b12bf1a18..cd324956a 100644 --- a/utils/configcpp/md5/md5.h +++ b/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 @@ -113,4 +112,3 @@ void MD5_Transform(MD5_CTX* c, const unsigned char* b); } #endif -#endif diff --git a/utils/configcpp/writeonce.h b/utils/configcpp/writeonce.h index 8ee1e7364..0e271e50b 100644 --- a/utils/configcpp/writeonce.h +++ b/utils/configcpp/writeonce.h @@ -22,8 +22,7 @@ /** * @file */ -#ifndef CONFIG_WRITEONCECONFIG_H -#define CONFIG_WRITEONCECONFIG_H +#pragma once #include #ifndef _MSC_VER @@ -140,5 +139,4 @@ private: } -#endif diff --git a/utils/configcpp/xmlparser.h b/utils/configcpp/xmlparser.h index 35fec9f21..367299be4 100644 --- a/utils/configcpp/xmlparser.h +++ b/utils/configcpp/xmlparser.h @@ -22,8 +22,7 @@ /** * @file */ -#ifndef CONFIG_XMLPARSER_H_ -#define CONFIG_XMLPARSER_H_ +#pragma once #include #include @@ -63,6 +62,5 @@ private: } //namespace -#endif // vim:ts=4 sw=4: diff --git a/utils/dataconvert/dataconvert.h b/utils/dataconvert/dataconvert.h index 123c90f65..2a634848f 100644 --- a/utils/dataconvert/dataconvert.h +++ b/utils/dataconvert/dataconvert.h @@ -22,8 +22,7 @@ ****************************************************************************/ /** @file */ -#ifndef DATACONVERT_H -#define DATACONVERT_H +#pragma once #include #include @@ -1784,5 +1783,4 @@ inline int128_t string_to_ll ( const std::string& data, bool& bSaturat #undef EXPORT -#endif //DATACONVERT_H diff --git a/utils/ddlcleanup/ddlcleanuputil.h b/utils/ddlcleanup/ddlcleanuputil.h index 7642e7aa4..57f7612d1 100644 --- a/utils/ddlcleanup/ddlcleanuputil.h +++ b/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 diff --git a/utils/funcexp/funcexp.h b/utils/funcexp/funcexp.h index 5275632b2..b376d2ac3 100644 --- a/utils/funcexp/funcexp.h +++ b/utils/funcexp/funcexp.h @@ -22,8 +22,7 @@ ****************************************************************************/ /** @file */ -#ifndef FUNCEXP_H -#define FUNCEXP_H +#pragma once #include #include @@ -118,5 +117,4 @@ inline void FuncExp::evaluate( rowgroup::RowGroup& rowgroup, execplan::ParseTree } -#endif diff --git a/utils/funcexp/funcexpwrapper.h b/utils/funcexp/funcexpwrapper.h index 6a310bfd9..01939ff38 100644 --- a/utils/funcexp/funcexpwrapper.h +++ b/utils/funcexp/funcexpwrapper.h @@ -32,8 +32,7 @@ /** @file */ -#ifndef FUNCEXPWRAPPER_H_ -#define FUNCEXPWRAPPER_H_ +#pragma once #include #include @@ -81,4 +80,3 @@ inline uint32_t FuncExpWrapper::getFilterCount() const } -#endif diff --git a/utils/funcexp/funchelpers.h b/utils/funcexp/funchelpers.h index 3317a5f69..7398d5dbb 100644 --- a/utils/funcexp/funchelpers.h +++ b/utils/funcexp/funchelpers.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef FUNCHELPERS_H__ -#define FUNCHELPERS_H__ +#pragma once #include @@ -793,4 +792,3 @@ const char* convNumToStr(int64_t, char*, int); } //namespace funcexp::helpers } //namespace funcexp -#endif diff --git a/utils/funcexp/functor.h b/utils/funcexp/functor.h index 9027ab351..e3afe0dc0 100644 --- a/utils/funcexp/functor.h +++ b/utils/funcexp/functor.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef FUNCTOR_H -#define FUNCTOR_H +#pragma once #include #include @@ -291,7 +290,6 @@ public: } -#endif diff --git a/utils/funcexp/functor_all.h b/utils/funcexp/functor_all.h index c0568f463..ddf1863af 100644 --- a/utils/funcexp/functor_all.h +++ b/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 diff --git a/utils/funcexp/functor_bool.h b/utils/funcexp/functor_bool.h index 7467f57d4..b55d8a9c3 100644 --- a/utils/funcexp/functor_bool.h +++ b/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 diff --git a/utils/funcexp/functor_dtm.h b/utils/funcexp/functor_dtm.h index c9d144ac3..126b9de56 100644 --- a/utils/funcexp/functor_dtm.h +++ b/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 diff --git a/utils/funcexp/functor_export.h b/utils/funcexp/functor_export.h index 270ecd208..c50d1d807 100644 --- a/utils/funcexp/functor_export.h +++ b/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 diff --git a/utils/funcexp/functor_int.h b/utils/funcexp/functor_int.h index 99b24c656..e49a00008 100644 --- a/utils/funcexp/functor_int.h +++ b/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 diff --git a/utils/funcexp/functor_real.h b/utils/funcexp/functor_real.h index 968f400fe..1ea6a9915 100644 --- a/utils/funcexp/functor_real.h +++ b/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 diff --git a/utils/funcexp/functor_str.h b/utils/funcexp/functor_str.h index e6abccf5c..06f16ceaa 100644 --- a/utils/funcexp/functor_str.h +++ b/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 diff --git a/utils/funcexp/sha.h b/utils/funcexp/sha.h index 936147e91..73119e259 100644 --- a/utils/funcexp/sha.h +++ b/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 diff --git a/utils/funcexp/sql_crypt.h b/utils/funcexp/sql_crypt.h index dbcba424a..68c56a0e6 100644 --- a/utils/funcexp/sql_crypt.h +++ b/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_ */ diff --git a/utils/funcexp/utf8.h b/utils/funcexp/utf8.h index 82b13f59f..ae4b41a3c 100644 --- a/utils/funcexp/utf8.h +++ b/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 diff --git a/utils/funcexp/utf8/checked.h b/utils/funcexp/utf8/checked.h index b18862d9e..740375f9d 100644 --- a/utils/funcexp/utf8/checked.h +++ b/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 @@ -389,6 +388,5 @@ public: } // namespace utf8 -#endif //header guard diff --git a/utils/funcexp/utf8/core.h b/utils/funcexp/utf8/core.h index 478eef134..4cd1c07ed 100644 --- a/utils/funcexp/utf8/core.h +++ b/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 #include @@ -336,6 +335,5 @@ inline bool is_bom (octet_iterator it) } } // namespace utf8 -#endif // header guard diff --git a/utils/funcexp/utf8/unchecked.h b/utils/funcexp/utf8/unchecked.h index cb76dbdda..a3181e5ec 100644 --- a/utils/funcexp/utf8/unchecked.h +++ b/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 diff --git a/utils/idbdatafile/BufferedFile.h b/utils/idbdatafile/BufferedFile.h index 3e6ae040e..c0332a470 100644 --- a/utils/idbdatafile/BufferedFile.h +++ b/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 #include @@ -64,4 +63,3 @@ private: }; } -#endif /* BUFFEREDFILE_H_ */ diff --git a/utils/idbdatafile/BufferedFileFactory.h b/utils/idbdatafile/BufferedFileFactory.h index b2d675e4b..150e83ba2 100644 --- a/utils/idbdatafile/BufferedFileFactory.h +++ b/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_ */ diff --git a/utils/idbdatafile/FileFactoryBase.h b/utils/idbdatafile/FileFactoryBase.h index d1572ca05..6e73a70e3 100644 --- a/utils/idbdatafile/FileFactoryBase.h +++ b/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_ */ diff --git a/utils/idbdatafile/IDBDataFile.h b/utils/idbdatafile/IDBDataFile.h index 7559b26f6..bf9e067a4 100644 --- a/utils/idbdatafile/IDBDataFile.h +++ b/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 #include @@ -247,4 +246,3 @@ const std::string& IDBDataFile::name() const } } -#endif /* IDBDATAFILE_H_ */ diff --git a/utils/idbdatafile/IDBFactory.h b/utils/idbdatafile/IDBFactory.h index 83e29e0a8..55a36c6c4 100644 --- a/utils/idbdatafile/IDBFactory.h +++ b/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 #include @@ -124,4 +123,3 @@ const std::string& IDBFactory::name(IDBDataFile::Types type) } -#endif /* IDBFACTORY_H_ */ diff --git a/utils/idbdatafile/IDBFileSystem.h b/utils/idbdatafile/IDBFileSystem.h index 98459e9f1..0f09ebff5 100644 --- a/utils/idbdatafile/IDBFileSystem.h +++ b/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 #include @@ -166,4 +165,3 @@ IDBFileSystem& IDBFileSystem::getFs(IDBDataFile::Types type) } -#endif /* IDBFILESYSTEM_H_ */ diff --git a/utils/idbdatafile/IDBLogger.h b/utils/idbdatafile/IDBLogger.h index 842ffecb3..8d89a091b 100644 --- a/utils/idbdatafile/IDBLogger.h +++ b/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 #include "IDBDataFile.h" @@ -69,4 +68,3 @@ bool IDBLogger::isEnabled() } -#endif /* IDBLOGGER_H_ */ diff --git a/utils/idbdatafile/IDBPolicy.h b/utils/idbdatafile/IDBPolicy.h index 11a534da2..ddc903d41 100644 --- a/utils/idbdatafile/IDBPolicy.h +++ b/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 #include @@ -253,4 +252,3 @@ int IDBPolicy::copyFile(const char* srcPath, const char* destPath) } -#endif /* IDBPOLICY_H_ */ diff --git a/utils/idbdatafile/PosixFileSystem.h b/utils/idbdatafile/PosixFileSystem.h index ab976d8bc..ba455989b 100644 --- a/utils/idbdatafile/PosixFileSystem.h +++ b/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_ */ diff --git a/utils/idbdatafile/UnbufferedFile.h b/utils/idbdatafile/UnbufferedFile.h index 6564c59d7..fe601cfb4 100644 --- a/utils/idbdatafile/UnbufferedFile.h +++ b/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 #include @@ -63,4 +62,3 @@ private: } -#endif /* UNBUFFEREDFILE_H_ */ diff --git a/utils/idbdatafile/UnbufferedFileFactory.h b/utils/idbdatafile/UnbufferedFileFactory.h index 3e2d59856..9b3b4e646 100644 --- a/utils/idbdatafile/UnbufferedFileFactory.h +++ b/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_ */ diff --git a/utils/idbdatafile/largefile64.h b/utils/idbdatafile/largefile64.h index 6c919804e..e1884db79 100644 --- a/utils/idbdatafile/largefile64.h +++ b/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 diff --git a/utils/idbdatafile/utility.h b/utils/idbdatafile/utility.h index 15f66c2a9..d1e3502b7 100644 --- a/utils/idbdatafile/utility.h +++ b/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 #include @@ -117,4 +116,3 @@ int modeStrToFlags(const char* mode, int& createflags) } -#endif /* UTILITY_H_ */ diff --git a/utils/joiner/btree.h b/utils/joiner/btree.h index 1a7c94bcb..9fed68ac3 100644 --- a/utils/joiner/btree.h +++ b/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 #include @@ -2909,4 +2908,3 @@ void btree_iterator::decrement_slow() } // namespace btree -#endif // UTIL_BTREE_BTREE_H__ diff --git a/utils/joiner/btree_container.h b/utils/joiner/btree_container.h index 72874401e..697bdec39 100644 --- a/utils/joiner/btree_container.h +++ b/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 #include @@ -457,4 +456,3 @@ public: } // namespace btree -#endif // UTIL_BTREE_BTREE_CONTAINER_H__ diff --git a/utils/joiner/btree_map.h b/utils/joiner/btree_map.h index 41b06e679..b13728b19 100644 --- a/utils/joiner/btree_map.h +++ b/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 #include @@ -138,4 +137,3 @@ inline void swap(btree_multimap& x, } // namespace btree -#endif // UTIL_BTREE_BTREE_MAP_H__ diff --git a/utils/joiner/btree_set.h b/utils/joiner/btree_set.h index bb149b243..9dad2c6fa 100644 --- a/utils/joiner/btree_set.h +++ b/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 #include @@ -129,4 +128,3 @@ inline void swap(btree_multiset& x, } // namespace btree -#endif // UTIL_BTREE_BTREE_SET_H__ diff --git a/utils/joiner/joiner.h b/utils/joiner/joiner.h index e374de3ab..9ab9cfb4f 100644 --- a/utils/joiner/joiner.h +++ b/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 #include @@ -207,4 +206,3 @@ private: } -#endif diff --git a/utils/joiner/joinpartition.h b/utils/joiner/joinpartition.h index 9c33d8e28..0fcd439eb 100644 --- a/utils/joiner/joinpartition.h +++ b/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 diff --git a/utils/joiner/tuplejoiner.h b/utils/joiner/tuplejoiner.h index 9106be3d0..c843f9f8d 100644 --- a/utils/joiner/tuplejoiner.h +++ b/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 #include @@ -581,4 +580,3 @@ private: } -#endif diff --git a/utils/loggingcpp/errorcodes.h b/utils/loggingcpp/errorcodes.h index e270ece65..3bf375045 100644 --- a/utils/loggingcpp/errorcodes.h +++ b/utils/loggingcpp/errorcodes.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef LOGGING_ERRORCODES_H -#define LOGGING_ERRORCODES_H +#pragma once #include #include @@ -97,5 +96,4 @@ private: }; } -#endif //LOGGING_ERRORCODES_H diff --git a/utils/loggingcpp/exceptclasses.h b/utils/loggingcpp/exceptclasses.h index 3fd77dc8a..5e3a9e229 100644 --- a/utils/loggingcpp/exceptclasses.h +++ b/utils/loggingcpp/exceptclasses.h @@ -22,8 +22,7 @@ /** @file */ -#ifndef LOGGING_EXCEPTCLASSES_H -#define LOGGING_EXCEPTCLASSES_H +#pragma once #include #include @@ -278,5 +277,4 @@ public: } -#endif // vim:ts=4 sw=4: diff --git a/utils/loggingcpp/idberrorinfo.h b/utils/loggingcpp/idberrorinfo.h index f28fe1c2b..a33416e13 100644 --- a/utils/loggingcpp/idberrorinfo.h +++ b/utils/loggingcpp/idberrorinfo.h @@ -22,8 +22,7 @@ /** * @file */ -#ifndef LOGGING_IDBERRORINFO_H -#define LOGGING_IDBERRORINFO_H +#pragma once #include #include @@ -65,4 +64,3 @@ private: }//namespace logging -#endif diff --git a/utils/loggingcpp/logger.h b/utils/loggingcpp/logger.h index f640f7d6b..f552ac6c2 100644 --- a/utils/loggingcpp/logger.h +++ b/utils/loggingcpp/logger.h @@ -21,8 +21,7 @@ /** @file */ -#ifndef LOGGING_LOGGER_H_ -#define LOGGING_LOGGER_H_ +#pragma once #include #include @@ -92,5 +91,4 @@ typedef boost::shared_ptr SPL; } -#endif diff --git a/utils/loggingcpp/loggingid.h b/utils/loggingcpp/loggingid.h index 0b47ebcfd..f08159e1f 100644 --- a/utils/loggingcpp/loggingid.h +++ b/utils/loggingcpp/loggingid.h @@ -22,8 +22,7 @@ /** * @file */ -#ifndef LOGGING_LOGGINGID_H -#define LOGGING_LOGGINGID_H +#pragma once #include @@ -50,4 +49,3 @@ struct LoggingID } -#endif diff --git a/utils/loggingcpp/messagelog.h b/utils/loggingcpp/messagelog.h index 2e2955e9e..a70b3caec 100644 --- a/utils/loggingcpp/messagelog.h +++ b/utils/loggingcpp/messagelog.h @@ -22,8 +22,7 @@ /** * @file */ -#ifndef LOGGING_MESSAGELOG_H -#define LOGGING_MESSAGELOG_H +#pragma once #include @@ -154,4 +153,3 @@ void logEventToDataLog(unsigned messageId, const std::string& messageText); } -#endif diff --git a/utils/loggingcpp/messageobj.h b/utils/loggingcpp/messageobj.h index 735dd847b..685183bc4 100644 --- a/utils/loggingcpp/messageobj.h +++ b/utils/loggingcpp/messageobj.h @@ -22,8 +22,7 @@ /** * @file */ -#ifndef LOGGING_MESSAGEOBJ_H -#define LOGGING_MESSAGEOBJ_H +#pragma once #include #include @@ -163,4 +162,3 @@ inline void swap(logging::Message& lhs, logging::Message& rhs) }//namespace logging -#endif diff --git a/utils/loggingcpp/sqllogger.h b/utils/loggingcpp/sqllogger.h index 0af43fee2..f4b1505b9 100644 --- a/utils/loggingcpp/sqllogger.h +++ b/utils/loggingcpp/sqllogger.h @@ -23,8 +23,7 @@ /** @file */ -#ifndef LOGGING_SQLLOGGER_H_ -#define LOGGING_SQLLOGGER_H_ +#pragma once #include @@ -60,5 +59,4 @@ private: }; } -#endif diff --git a/utils/loggingcpp/stopwatch.h b/utils/loggingcpp/stopwatch.h index aa26a36ab..ca82feb8d 100644 --- a/utils/loggingcpp/stopwatch.h +++ b/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 #include #include @@ -138,4 +137,3 @@ private: } // end of logging namespace -#endif // STOPWATCH_H diff --git a/utils/messageqcpp/bytestream.h b/utils/messageqcpp/bytestream.h index 153d22d3b..f8a0dcb2d 100644 --- a/utils/messageqcpp/bytestream.h +++ b/utils/messageqcpp/bytestream.h @@ -18,8 +18,7 @@ MA 02110-1301, USA. */ -#ifndef MESSAGEQCPP_BYTESTREAM_H -#define MESSAGEQCPP_BYTESTREAM_H +#pragma once #include #include @@ -762,4 +761,3 @@ template<> inline void swap(messageqcpp::ByteStream& lh #undef EXPORT -#endif //MESSAGEQCPP_BYTESTREAM_H diff --git a/utils/messageqcpp/bytestreampool.h b/utils/messageqcpp/bytestreampool.h index 443964b16..14dac6613 100644 --- a/utils/messageqcpp/bytestreampool.h +++ b/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 diff --git a/utils/messageqcpp/compressed_iss.h b/utils/messageqcpp/compressed_iss.h index 2514195da..29096e13e 100644 --- a/utils/messageqcpp/compressed_iss.h +++ b/utils/messageqcpp/compressed_iss.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef MESSAGEQCPP_COMPRESSED_ISS_H -#define MESSAGEQCPP_COMPRESSED_ISS_H +#pragma once #include #ifndef _MSC_VER @@ -63,4 +62,3 @@ private: #undef EXPORT -#endif diff --git a/utils/messageqcpp/inetstreamsocket.h b/utils/messageqcpp/inetstreamsocket.h index 81538177e..63ba3e047 100644 --- a/utils/messageqcpp/inetstreamsocket.h +++ b/utils/messageqcpp/inetstreamsocket.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef MESSAGEQCPP_INETSTREAMSOCKET_H -#define MESSAGEQCPP_INETSTREAMSOCKET_H +#pragma once #include #include @@ -288,5 +287,4 @@ inline std::ostream& operator<<(std::ostream& os, const InetStreamSocket& rhs) #undef EXPORT -#endif //MESSAGEQCPP_INETSTREAMSOCKET_H diff --git a/utils/messageqcpp/iosocket.h b/utils/messageqcpp/iosocket.h index 6ec946c81..ff8565594 100644 --- a/utils/messageqcpp/iosocket.h +++ b/utils/messageqcpp/iosocket.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef MESSAGEQCPP_IOSOCKET_H -#define MESSAGEQCPP_IOSOCKET_H +#pragma once #include #include @@ -308,5 +307,4 @@ inline std::ostream& operator<<(std::ostream& os, const IOSocket& rhs) #undef EXPORT -#endif //MESSAGEQCPP_IOSOCKET_H diff --git a/utils/messageqcpp/messagequeue.h b/utils/messageqcpp/messagequeue.h index 14ca00883..1892cc1bc 100644 --- a/utils/messageqcpp/messagequeue.h +++ b/utils/messageqcpp/messagequeue.h @@ -21,8 +21,7 @@ * ******************************************************************************************/ /** @file */ -#ifndef MESSAGEQCPP_MESSAGEQUEUE_H -#define MESSAGEQCPP_MESSAGEQUEUE_H +#pragma once #include #include @@ -335,6 +334,5 @@ inline void MessageQueueClient::syncProto(bool use) #undef EXPORT -#endif //MESSAGEQCPP_MESSAGEQUEUE_H // vim:ts=4 sw=4: diff --git a/utils/messageqcpp/messagequeuepool.h b/utils/messageqcpp/messagequeuepool.h index 553328e7b..b7c1b5b7b 100644 --- a/utils/messageqcpp/messagequeuepool.h +++ b/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 #include "messagequeue.h" @@ -55,4 +54,3 @@ private: }; } -#endif //MESSAGEQCPP_MESSAGEQUEUECLIENT_H diff --git a/utils/messageqcpp/serializeable.h b/utils/messageqcpp/serializeable.h index 2137f04ed..1d14b756d 100644 --- a/utils/messageqcpp/serializeable.h +++ b/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 diff --git a/utils/messageqcpp/serversocket.h b/utils/messageqcpp/serversocket.h index 8e9c0979b..cd08804a5 100644 --- a/utils/messageqcpp/serversocket.h +++ b/utils/messageqcpp/serversocket.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef MESSAGEQCPP_SERVERSOCKET_H -#define MESSAGEQCPP_SERVERSOCKET_H +#pragma once #include #ifdef _MSC_VER @@ -171,5 +170,4 @@ inline void ServerSocket::syncProto(bool use) } //namespace messageqcpp -#endif //MESSAGEQCPP_SERVERSOCKET_H diff --git a/utils/messageqcpp/socket.h b/utils/messageqcpp/socket.h index 41c5e4628..8349b0f56 100644 --- a/utils/messageqcpp/socket.h +++ b/utils/messageqcpp/socket.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef MESSAGEQCPP_SOCKET_H -#define MESSAGEQCPP_SOCKET_H +#pragma once #include #include @@ -184,5 +183,4 @@ public: } //namespace messageqcpp -#endif //MESSAGEQCPP_SOCKET_H diff --git a/utils/messageqcpp/socketclosed.h b/utils/messageqcpp/socketclosed.h index c2993edcd..d54f4821b 100644 --- a/utils/messageqcpp/socketclosed.h +++ b/utils/messageqcpp/socketclosed.h @@ -25,8 +25,7 @@ #include #include -#ifndef SOCKETCLOSED_H_ -#define SOCKETCLOSED_H_ +#pragma once namespace messageqcpp { @@ -58,4 +57,3 @@ public: } -#endif diff --git a/utils/messageqcpp/socketparms.h b/utils/messageqcpp/socketparms.h index 9fe4cbadf..09b3274b9 100644 --- a/utils/messageqcpp/socketparms.h +++ b/utils/messageqcpp/socketparms.h @@ -21,8 +21,7 @@ * ***********************************************************************/ /** @file */ -#ifndef MESSAGEQCPP_SOCKETPARMS_H -#define MESSAGEQCPP_SOCKETPARMS_H +#pragma once class MessageQTestSuite; @@ -153,5 +152,4 @@ inline void SocketParms::protocol(int protocol) } //namespace messageqcpp -#endif //MESSAGEQCPP_SOCKETPARMS_H diff --git a/utils/multicast/impl.h b/utils/multicast/impl.h index 035d6c587..240b2eab7 100644 --- a/utils/multicast/impl.h +++ b/utils/multicast/impl.h @@ -27,8 +27,7 @@ /** @file */ -#ifndef MCAST_IMPL_H__ -#define MCAST_IMPL_H__ +#pragma once #include #include @@ -63,5 +62,4 @@ public: } -#endif diff --git a/utils/multicast/mc_fifo.h b/utils/multicast/mc_fifo.h index c006ef60d..bf98e1559 100644 --- a/utils/multicast/mc_fifo.h +++ b/utils/multicast/mc_fifo.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef FIFO_H -#define FIFO_H +#pragma once #include "threads.h" #include "produconsum.h" @@ -33,4 +32,3 @@ typedef struct fifo pthread_t thread; }* fifo_t; -#endif diff --git a/utils/multicast/multicast.h b/utils/multicast/multicast.h index d468c1cde..291de867e 100644 --- a/utils/multicast/multicast.h +++ b/utils/multicast/multicast.h @@ -24,8 +24,7 @@ * class Multicast interface */ -#ifndef MULTICAST_H -#define MULTICAST_H +#pragma once #include "messagequeue.h" @@ -130,5 +129,4 @@ private: } //namespace -#endif //MULTICAST_H diff --git a/utils/multicast/participants.h b/utils/multicast/participants.h index e992aa7ef..6de6a46be 100644 --- a/utils/multicast/participants.h +++ b/utils/multicast/participants.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef PARTICIPANTS_H -#define PARTICIPANTS_H +#pragma once #define MAX_CLIENTS 1024 @@ -28,4 +27,3 @@ typedef struct participantsDb* participantsDb_t; void udpc_printNotSet(participantsDb_t db, char* d); void udpc_printSet(participantsDb_t db, char* d); -#endif diff --git a/utils/multicast/produconsum.h b/utils/multicast/produconsum.h index b0990393d..e6eee1712 100644 --- a/utils/multicast/produconsum.h +++ b/utils/multicast/produconsum.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef PRODUCONSUM_H -#define PRODUCONSUM_H +#pragma once typedef struct produconsum* produconsum_t; @@ -25,4 +24,3 @@ typedef struct produconsum* produconsum_t; */ int pc_consumeAnyContiguous(produconsum_t pc); -#endif diff --git a/utils/multicast/socklib.h b/utils/multicast/socklib.h index 28d2b8f4d..fe25de1e4 100644 --- a/utils/multicast/socklib.h +++ b/utils/multicast/socklib.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef SOCKLIB_H -#define SOCKLIB_H +#pragma once #ifndef UDPCAST_CONFIG_H # define UDPCAST_CONFIG_H @@ -173,4 +172,3 @@ static inline void initMsgHdr(struct msghdr* hdr) typedef unsigned long in_addr_t; #endif -#endif diff --git a/utils/multicast/statistics.h b/utils/multicast/statistics.h index 76d34d777..fa07f8eef 100644 --- a/utils/multicast/statistics.h +++ b/utils/multicast/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 typedef struct receiver_stats* receiver_stats_t; @@ -39,4 +38,3 @@ sender_stats_t udpc_allocSenderStats(int fd, FILE* logfile, long bwPeriod, void udpc_displaySenderStats(sender_stats_t, int blockSize, int sliceSize, int isFinal); -#endif diff --git a/utils/multicast/threads.h b/utils/multicast/threads.h index e41e4b94b..99b6209c7 100644 --- a/utils/multicast/threads.h +++ b/utils/multicast/threads.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef UDPCTHREADS_H -#define UDPCTHREADS_H +#pragma once #ifdef __MINGW32__ @@ -155,4 +154,3 @@ static inline int pthread_cond_timedwait(pthread_cond_t* cond, #define THREAD_RETURN void * #endif /* __MINGW32__ */ -#endif diff --git a/utils/multicast/udp-sender.h b/utils/multicast/udp-sender.h index 526f556b4..6fb1cb9a4 100644 --- a/utils/multicast/udp-sender.h +++ b/utils/multicast/udp-sender.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef UDP_SENDER_H -#define UDP_SENDER_H +#pragma once #include "udp-sender.h" #include "udpcast.h" @@ -105,4 +104,3 @@ int localReader(struct fifo* fifo, int in); */ #define FLAG_STREAMING 0x0100 -#endif diff --git a/utils/multicast/udpc-protoc.h b/utils/multicast/udpc-protoc.h index 6e298c70c..570be2388 100644 --- a/utils/multicast/udpc-protoc.h +++ b/utils/multicast/udpc-protoc.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef UDPC_PROTOC_H -#define UDPC_PROTOC_H +#pragma once #include "udpcast.h" @@ -214,4 +213,3 @@ union serverDataMsg CAP_BIG_ENDIAN) -#endif diff --git a/utils/multicast/udpcast.h b/utils/multicast/udpcast.h index ac31abbc2..ba5341b40 100644 --- a/utils/multicast/udpcast.h +++ b/utils/multicast/udpcast.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef UDPCAST_H -#define UDPCAST_H +#pragma once #include "socklib.h" #include @@ -159,4 +158,3 @@ int udpc_shouldPrintUncompressedPos(int deflt, int fd, int pipe); # define DEBUG 0 #endif -#endif diff --git a/utils/multicast/util.h b/utils/multicast/util.h index c6c7864e8..d3a3f1b42 100644 --- a/utils/multicast/util.h +++ b/utils/multicast/util.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef UTIL_H -#define UTIL_H +#pragma once #include @@ -31,4 +30,3 @@ #define BIT_ISSET(x, map) (map[POS(x,map)] & MASK(x,map)) -#endif diff --git a/utils/querystats/querystats.h b/utils/querystats/querystats.h index 42d54ef77..b1b803db5 100644 --- a/utils/querystats/querystats.h +++ b/utils/querystats/querystats.h @@ -21,8 +21,7 @@ * ***********************************************************************/ -#ifndef QUERYSTATS_H_ -#define QUERYSTATS_H_ +#pragma once #include #include @@ -139,4 +138,3 @@ private: } -#endif diff --git a/utils/querytele/QueryTeleService.h b/utils/querytele/QueryTeleService.h index 9222d20e8..7d3a3e229 100644 --- a/utils/querytele/QueryTeleService.h +++ b/utils/querytele/QueryTeleService.h @@ -4,8 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -#ifndef QueryTeleService_H -#define QueryTeleService_H +#pragma once #include #include "querytele_types.h" @@ -499,4 +498,3 @@ public: } // namespace -#endif diff --git a/utils/querytele/querystepparms.h b/utils/querytele/querystepparms.h index 20cb861d9..c207d4260 100644 --- a/utils/querytele/querystepparms.h +++ b/utils/querytele/querystepparms.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef QUERYSTEPPARMS_H__ -#define QUERYSTEPPARMS_H__ +#pragma once #include "telestats.h" @@ -39,5 +38,4 @@ private: } -#endif diff --git a/utils/querytele/querytele.h b/utils/querytele/querytele.h index 44b35b205..a7d46212a 100644 --- a/utils/querytele/querytele.h +++ b/utils/querytele/querytele.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef QUERYTELE_H__ -#define QUERYTELE_H__ +#pragma once #include "queryteleclient.h" #include "queryteleserverparms.h" @@ -27,5 +26,4 @@ namespace querytele { } -#endif diff --git a/utils/querytele/querytele_constants.h b/utils/querytele/querytele_constants.h index d90cf4537..c590cb5f9 100644 --- a/utils/querytele/querytele_constants.h +++ b/utils/querytele/querytele_constants.h @@ -4,8 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -#ifndef querytele_CONSTANTS_H -#define querytele_CONSTANTS_H +#pragma once #include "querytele_types.h" @@ -23,4 +22,3 @@ extern const queryteleConstants g_querytele_constants; } // namespace -#endif diff --git a/utils/querytele/querytele_types.h b/utils/querytele/querytele_types.h index 9d8a530e3..ca3bf80fe 100644 --- a/utils/querytele/querytele_types.h +++ b/utils/querytele/querytele_types.h @@ -4,8 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -#ifndef querytele_TYPES_H -#define querytele_TYPES_H +#pragma once #include #include @@ -839,4 +838,3 @@ void swap(ImportTele& a, ImportTele& b); } // namespace -#endif diff --git a/utils/querytele/queryteleclient.h b/utils/querytele/queryteleclient.h index efeebeefa..45332e90b 100644 --- a/utils/querytele/queryteleclient.h +++ b/utils/querytele/queryteleclient.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef QUERYTELECLIENT_H__ -#define QUERYTELECLIENT_H__ +#pragma once #include #include @@ -90,5 +89,4 @@ private: #undef EXPORT -#endif diff --git a/utils/querytele/queryteleprotoimpl.h b/utils/querytele/queryteleprotoimpl.h index e5a9215ca..83ff970ed 100644 --- a/utils/querytele/queryteleprotoimpl.h +++ b/utils/querytele/queryteleprotoimpl.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef QUERYTELEPROTO_IMPL_H__ -#define QUERYTELEPROTO_IMPL_H__ +#pragma once #include "queryteleserverparms.h" @@ -47,5 +46,4 @@ private: } -#endif diff --git a/utils/querytele/queryteleserverparms.h b/utils/querytele/queryteleserverparms.h index cc101883b..f0068c9b2 100644 --- a/utils/querytele/queryteleserverparms.h +++ b/utils/querytele/queryteleserverparms.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef QUERYTELESERVERPARMS_H__ -#define QUERYTELESERVERPARMS_H__ +#pragma once #include @@ -41,5 +40,4 @@ private: } -#endif diff --git a/utils/querytele/telestats.h b/utils/querytele/telestats.h index dcb39d167..2b0ba143d 100644 --- a/utils/querytele/telestats.h +++ b/utils/querytele/telestats.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TELESTATS_H__ -#define TELESTATS_H__ +#pragma once #include #include @@ -194,5 +193,4 @@ struct ImportTeleStats } -#endif diff --git a/utils/regr/corr.h b/utils/regr/corr.h index 850690da4..dd7d1a3d2 100644 --- a/utils/regr/corr.h +++ b/utils/regr/corr.h @@ -28,8 +28,7 @@ * CREATE AGGREGATE FUNCTION corr returns REAL soname 'libregr_mysql.so'; * */ -#ifndef HEADER_corr -#define HEADER_corr +#pragma once #include #include @@ -82,5 +81,4 @@ protected: #undef EXPORT -#endif // HEADER_corr.h diff --git a/utils/regr/covar_pop.h b/utils/regr/covar_pop.h index dd675c7fa..68641e6bf 100644 --- a/utils/regr/covar_pop.h +++ b/utils/regr/covar_pop.h @@ -28,8 +28,7 @@ * CREATE AGGREGATE FUNCTION covar_pop returns REAL soname 'libregr_mysql.so'; * */ -#ifndef HEADER_covar_pop -#define HEADER_covar_pop +#pragma once #include #include @@ -82,5 +81,4 @@ protected: #undef EXPORT -#endif // HEADER_covar_pop.h diff --git a/utils/regr/covar_samp.h b/utils/regr/covar_samp.h index f1511a364..9812d2cad 100644 --- a/utils/regr/covar_samp.h +++ b/utils/regr/covar_samp.h @@ -28,8 +28,7 @@ * CREATE AGGREGATE FUNCTION covar_samp returns REAL soname 'libregr_mysql.so'; * */ -#ifndef HEADER_covar_samp -#define HEADER_covar_samp +#pragma once #include #include @@ -82,5 +81,4 @@ protected: #undef EXPORT -#endif // HEADER_covar_samp.h diff --git a/utils/regr/moda.h b/utils/regr/moda.h index ae47f8462..f0cdba2cd 100644 --- a/utils/regr/moda.h +++ b/utils/regr/moda.h @@ -34,8 +34,7 @@ * 1) closest to AVG * 2) smallest value */ -#ifndef HEADER_moda -#define HEADER_moda +#pragma once #include #include @@ -282,5 +281,4 @@ protected: #undef EXPORT -#endif // HEADER_mode.h diff --git a/utils/regr/regr_avgx.h b/utils/regr/regr_avgx.h index 58138eff3..191d22548 100644 --- a/utils/regr/regr_avgx.h +++ b/utils/regr/regr_avgx.h @@ -28,8 +28,7 @@ * CREATE AGGREGATE FUNCTION regr_avgx returns REAL soname 'libregr_mysql.so'; * */ -#ifndef HEADER_regr_avgx -#define HEADER_regr_avgx +#pragma once #include #include @@ -92,5 +91,4 @@ protected: #undef EXPORT -#endif // HEADER_regr_avgx.h diff --git a/utils/regr/regr_avgy.h b/utils/regr/regr_avgy.h index 957becdd7..0f3a8a15b 100644 --- a/utils/regr/regr_avgy.h +++ b/utils/regr/regr_avgy.h @@ -28,8 +28,7 @@ * CREATE AGGREGATE FUNCTION regr_avgy returns REAL soname 'libregr_mysql.so'; * */ -#ifndef HEADER_regr_avgy -#define HEADER_regr_avgy +#pragma once #include #include @@ -82,5 +81,4 @@ protected: #undef EXPORT -#endif // HEADER_regr_avgy.h diff --git a/utils/regr/regr_count.h b/utils/regr/regr_count.h index b63a2d582..20ec11e0c 100644 --- a/utils/regr/regr_count.h +++ b/utils/regr/regr_count.h @@ -28,8 +28,7 @@ * CREATE AGGREGATE FUNCTION regr_count returns INTEGER soname 'libregr_mysql.so'; * */ -#ifndef HEADER_regr_count -#define HEADER_regr_count +#pragma once #include #include @@ -82,5 +81,4 @@ protected: #undef EXPORT -#endif // HEADER_regr_count.h diff --git a/utils/regr/regr_intercept.h b/utils/regr/regr_intercept.h index 2ccd272f5..dcc18b3ae 100644 --- a/utils/regr/regr_intercept.h +++ b/utils/regr/regr_intercept.h @@ -28,8 +28,7 @@ * CREATE AGGREGATE FUNCTION regr_intercept returns REAL soname 'libregr_mysql.so'; * */ -#ifndef HEADER_regr_intercept -#define HEADER_regr_intercept +#pragma once #include #include @@ -82,5 +81,4 @@ protected: #undef EXPORT -#endif // HEADER_regr_intercept.h diff --git a/utils/regr/regr_r2.h b/utils/regr/regr_r2.h index 26082d979..a47f63677 100644 --- a/utils/regr/regr_r2.h +++ b/utils/regr/regr_r2.h @@ -28,8 +28,7 @@ * CREATE AGGREGATE FUNCTION regr_r2 returns REAL soname 'libregr_mysql.so'; * */ -#ifndef HEADER_regr_r2 -#define HEADER_regr_r2 +#pragma once #include #include @@ -82,5 +81,4 @@ protected: #undef EXPORT -#endif // HEADER_regr_r2.h diff --git a/utils/regr/regr_slope.h b/utils/regr/regr_slope.h index d14639cf1..beea23b10 100644 --- a/utils/regr/regr_slope.h +++ b/utils/regr/regr_slope.h @@ -28,8 +28,7 @@ * CREATE AGGREGATE FUNCTION regr_slope returns REAL soname 'libregr_mysql.so'; * */ -#ifndef HEADER_regr_slope -#define HEADER_regr_slope +#pragma once #include #include @@ -82,5 +81,4 @@ protected: #undef EXPORT -#endif // HEADER_regr_slope.h diff --git a/utils/regr/regr_sxx.h b/utils/regr/regr_sxx.h index 2f180483c..e5a3cb3e3 100644 --- a/utils/regr/regr_sxx.h +++ b/utils/regr/regr_sxx.h @@ -28,8 +28,7 @@ * CREATE AGGREGATE FUNCTION regr_sxx returns REAL soname 'libregr_mysql.so'; * */ -#ifndef HEADER_regr_sxx -#define HEADER_regr_sxx +#pragma once #include #include @@ -82,5 +81,4 @@ protected: #undef EXPORT -#endif // HEADER_regr_sxx.h diff --git a/utils/regr/regr_sxy.h b/utils/regr/regr_sxy.h index 83517e113..5e5d71df1 100644 --- a/utils/regr/regr_sxy.h +++ b/utils/regr/regr_sxy.h @@ -28,8 +28,7 @@ * CREATE AGGREGATE FUNCTION regr_sxy returns REAL soname 'libregr_mysql.so'; * */ -#ifndef HEADER_regr_sxy -#define HEADER_regr_sxy +#pragma once #include #include @@ -82,5 +81,4 @@ protected: #undef EXPORT -#endif // HEADER_regr_sxy.h diff --git a/utils/regr/regr_syy.h b/utils/regr/regr_syy.h index 05d7e5f8f..42d015aeb 100644 --- a/utils/regr/regr_syy.h +++ b/utils/regr/regr_syy.h @@ -28,8 +28,7 @@ * CREATE AGGREGATE FUNCTION regr_syy returns REAL soname 'libregr_mysql.so'; * */ -#ifndef HEADER_regr_syy -#define HEADER_regr_syy +#pragma once #include #include @@ -82,5 +81,4 @@ protected: #undef EXPORT -#endif // HEADER_regr_syy.h diff --git a/utils/rowgroup/rowaggregation.h b/utils/rowgroup/rowaggregation.h index be785fcff..ce42b23eb 100644 --- a/utils/rowgroup/rowaggregation.h +++ b/utils/rowgroup/rowaggregation.h @@ -18,8 +18,7 @@ MA 02110-1301, USA. */ -#ifndef ROWAGGREGATION_H -#define ROWAGGREGATION_H +#pragma once /** @file rowaggregation.h * Classes in this file are used to aggregate Rows in RowGroups. @@ -1034,5 +1033,4 @@ typedef boost::shared_ptr SP_ROWAGG_DIST; } // end of rowgroup namespace -#endif // ROWAGGREGATION_H diff --git a/utils/rowgroup/rowgroup.h b/utils/rowgroup/rowgroup.h index 44a7fd532..ec78fb58f 100644 --- a/utils/rowgroup/rowgroup.h +++ b/utils/rowgroup/rowgroup.h @@ -25,8 +25,7 @@ // // Author: Patrick LeBlanc , (C) 2008 -#ifndef ROWGROUP_H_ -#define ROWGROUP_H_ +#pragma once #include #include @@ -2276,5 +2275,4 @@ inline void RGData::getRow(uint32_t num, Row* row) } -#endif // vim:ts=4 sw=4: diff --git a/utils/rowgroup/rowstorage.h b/utils/rowgroup/rowstorage.h index 6e5235bcf..9555aff1b 100644 --- a/utils/rowgroup/rowstorage.h +++ b/utils/rowgroup/rowstorage.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef ROWSTORAGE_H -#define ROWSTORAGE_H +#pragma once #include "resourcemanager.h" #include "rowgroup.h" @@ -375,4 +374,3 @@ private: } // namespace rowgroup -#endif // MYSQL_ROWSTORAGE_H diff --git a/utils/rwlock/rwlock.h b/utils/rwlock/rwlock.h index 08b7f230b..463e9a70f 100644 --- a/utils/rwlock/rwlock.h +++ b/utils/rwlock/rwlock.h @@ -24,8 +24,7 @@ * class RWLock interface */ -#ifndef RWLOCK_H_ -#define RWLOCK_H_ +#pragma once #include #include @@ -278,5 +277,4 @@ private: #undef EXPORT -#endif // vim:ts=4 sw=4: diff --git a/utils/rwlock/rwlock_local.h b/utils/rwlock/rwlock_local.h index 833f01da5..bd8e4c017 100644 --- a/utils/rwlock/rwlock_local.h +++ b/utils/rwlock/rwlock_local.h @@ -24,8 +24,7 @@ * class RWLock_local interface */ -#ifndef RWLock_local_LOCAL_H_ -#define RWLock_local_LOCAL_H_ +#pragma once #include #include @@ -198,4 +197,3 @@ private: } -#endif diff --git a/utils/startup/installdir.h b/utils/startup/installdir.h index f952ba3b2..98cd99bd1 100644 --- a/utils/startup/installdir.h +++ b/utils/startup/installdir.h @@ -22,8 +22,7 @@ /** * @file */ -#ifndef STARTUP_INSTALLDIR_H__ -#define STARTUP_INSTALLDIR_H__ +#pragma once #include #include @@ -50,6 +49,5 @@ private: } -#endif // vim:ts=4 sw=4: diff --git a/utils/testbc/blockcacheclient.h b/utils/testbc/blockcacheclient.h index 13b345ab9..60e9fbef1 100644 --- a/utils/testbc/blockcacheclient.h +++ b/utils/testbc/blockcacheclient.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef BLOCKCACHEREQUESTCLIENT_H -#define BLOCKCACHEREQUESTCLIENT_H +#pragma once #include "blockrequestprocessor.h" #include "brmtypes.h" @@ -108,4 +107,3 @@ private: } -#endif diff --git a/utils/testbc/blockrequestprocessor.h b/utils/testbc/blockrequestprocessor.h index c6b061dca..5eada2a5c 100644 --- a/utils/testbc/blockrequestprocessor.h +++ b/utils/testbc/blockrequestprocessor.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef BLOCKREQUESTPROCESSOR_H -#define BLOCKREQUESTPROCESSOR_H +#pragma once /*************************************************************************** * @@ -136,4 +135,3 @@ private: }; } -#endif diff --git a/utils/testbc/fileblockrequestqueue.h b/utils/testbc/fileblockrequestqueue.h index 569750d75..4557ae80e 100644 --- a/utils/testbc/fileblockrequestqueue.h +++ b/utils/testbc/fileblockrequestqueue.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef FILEBLOCKREQUESTQUEUE_H -#define FILEBLOCKREQUESTQUEUE_H +#pragma once /*************************************************************************** * @@ -113,4 +112,3 @@ private: }; } -#endif diff --git a/utils/testbc/filebuffer.h b/utils/testbc/filebuffer.h index a14bb1fae..1c90aafad 100644 --- a/utils/testbc/filebuffer.h +++ b/utils/testbc/filebuffer.h @@ -23,8 +23,7 @@ * * ***************************************************************************/ -#ifndef FILEBUFFER_H -#define FILEBUFFER_H +#pragma once #include #include @@ -186,4 +185,3 @@ private: typedef std::vector FileBufferPool_t; } -#endif diff --git a/utils/testbc/filebuffermgr.h b/utils/testbc/filebuffermgr.h index 76ddda3d9..795fada2d 100644 --- a/utils/testbc/filebuffermgr.h +++ b/utils/testbc/filebuffermgr.h @@ -22,8 +22,7 @@ * * ***************************************************************************/ -#ifndef FILEBUFFERMGR_H -#define FILEBUFFERMGR_H +#pragma once #include #include "blocksize.h" #include "filebuffer.h" @@ -198,4 +197,3 @@ private: void depleteCache(); }; } -#endif diff --git a/utils/testbc/filerequest.h b/utils/testbc/filerequest.h index 5aa4ba4f7..851cb0840 100644 --- a/utils/testbc/filerequest.h +++ b/utils/testbc/filerequest.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef FILEREQUEST_H -#define FILEREQUEST_H +#pragma once /*************************************************************************** * @@ -256,4 +255,3 @@ private: enum request_type_enum fRqstType; }; } -#endif diff --git a/utils/testbc/iomanager.h b/utils/testbc/iomanager.h index b47efaf59..836998ef9 100644 --- a/utils/testbc/iomanager.h +++ b/utils/testbc/iomanager.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef IOMANAGER_H -#define IOMANAGER_H +#pragma once // $Id: iomanager.h 655 2008-07-08 16:42:54Z jrodriguez $ // // C++ Interface: iomanager @@ -108,5 +107,4 @@ private: }; } -#endif // vim:ts=4 sw=4: diff --git a/utils/testbc/logger.h b/utils/testbc/logger.h index 8fd85e697..391645554 100644 --- a/utils/testbc/logger.h +++ b/utils/testbc/logger.h @@ -21,8 +21,7 @@ /** @file */ -#ifndef PRIMPROC_LOGGER_H_ -#define PRIMPROC_LOGGER_H_ +#pragma once #include #include @@ -65,5 +64,4 @@ private: } -#endif diff --git a/utils/testbc/stats.h b/utils/testbc/stats.h index 4a1b33b7a..f4f0062a5 100644 --- a/utils/testbc/stats.h +++ b/utils/testbc/stats.h @@ -21,8 +21,7 @@ /** @file */ -#ifndef PRIMPROC_STATS_H -#define PRIMPROC_STATS_H +#pragma once #include #include @@ -65,4 +64,3 @@ private: } -#endif //PRIMPROC_STATS_H diff --git a/utils/threadpool/prioritythreadpool.h b/utils/threadpool/prioritythreadpool.h index f58af4d8d..1fc831787 100644 --- a/utils/threadpool/prioritythreadpool.h +++ b/utils/threadpool/prioritythreadpool.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef PRIORITYTHREADPOOL_H -#define PRIORITYTHREADPOOL_H +#pragma once #include #include @@ -131,4 +130,3 @@ private: } // namespace threadpool -#endif //PRIORITYTHREADPOOL_H diff --git a/utils/threadpool/threadpool.h b/utils/threadpool/threadpool.h index 5d2c9b9b1..e302a8c16 100644 --- a/utils/threadpool/threadpool.h +++ b/utils/threadpool/threadpool.h @@ -27,8 +27,7 @@ /** @file */ -#ifndef THREADPOOL_H -#define THREADPOOL_H +#pragma once #include #include @@ -406,4 +405,3 @@ private: #undef EXPORT -#endif //THREADPOOL_H diff --git a/utils/threadpool/weightedthreadpool.h b/utils/threadpool/weightedthreadpool.h index d96888c9a..ec7362d2e 100644 --- a/utils/threadpool/weightedthreadpool.h +++ b/utils/threadpool/weightedthreadpool.h @@ -22,8 +22,7 @@ ***********************************************************************/ /** @file */ -#ifndef WEIGHTEDTHREADPOOL_H -#define WEIGHTEDTHREADPOOL_H +#pragma once #include #include @@ -239,4 +238,3 @@ private: } // namespace threadpool -#endif //WEIGHTEDTHREADPOOL_H diff --git a/utils/thrift/thrift/TApplicationException.h b/utils/thrift/thrift/TApplicationException.h index 51ef0f80a..7b9c926da 100644 --- a/utils/thrift/thrift/TApplicationException.h +++ b/utils/thrift/thrift/TApplicationException.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TAPPLICATIONEXCEPTION_H_ -#define _THRIFT_TAPPLICATIONEXCEPTION_H_ 1 +#pragma once #include @@ -148,4 +147,3 @@ protected: } } // apache::thrift -#endif // #ifndef _THRIFT_TAPPLICATIONEXCEPTION_H_ diff --git a/utils/thrift/thrift/TDispatchProcessor.h b/utils/thrift/thrift/TDispatchProcessor.h index 851626127..1ec6b77c6 100644 --- a/utils/thrift/thrift/TDispatchProcessor.h +++ b/utils/thrift/thrift/TDispatchProcessor.h @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -#ifndef _THRIFT_TDISPATCHPROCESSOR_H_ -#define _THRIFT_TDISPATCHPROCESSOR_H_ 1 +#pragma once #include @@ -153,4 +152,3 @@ class TDispatchProcessorT : } } // apache::thrift -#endif // _THRIFT_TDISPATCHPROCESSOR_H_ diff --git a/utils/thrift/thrift/TLogging.h b/utils/thrift/thrift/TLogging.h index 4a376f400..256da1007 100644 --- a/utils/thrift/thrift/TLogging.h +++ b/utils/thrift/thrift/TLogging.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TLOGGING_H_ -#define _THRIFT_TLOGGING_H_ 1 +#pragma once #include @@ -190,4 +189,3 @@ #define T_GENERIC_PROTOCOL(template_class, generic_prot, specific_prot) #endif -#endif // #ifndef _THRIFT_TLOGGING_H_ diff --git a/utils/thrift/thrift/TProcessor.h b/utils/thrift/thrift/TProcessor.h index 3b5250bd4..861a11c65 100644 --- a/utils/thrift/thrift/TProcessor.h +++ b/utils/thrift/thrift/TProcessor.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TPROCESSOR_H_ -#define _THRIFT_TPROCESSOR_H_ 1 +#pragma once #include #include @@ -261,4 +260,3 @@ private: } } // apache::thrift -#endif // #ifndef _THRIFT_TPROCESSOR_H_ diff --git a/utils/thrift/thrift/TReflectionLocal.h b/utils/thrift/thrift/TReflectionLocal.h index bf17b0f8a..f54295a54 100644 --- a/utils/thrift/thrift/TReflectionLocal.h +++ b/utils/thrift/thrift/TReflectionLocal.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TREFLECTIONLOCAL_H_ -#define _THRIFT_TREFLECTIONLOCAL_H_ 1 +#pragma once #include #include @@ -109,4 +108,3 @@ struct TypeSpec } } // apache::thrift::reflection::local -#endif // #ifndef _THRIFT_TREFLECTIONLOCAL_H_ diff --git a/utils/thrift/thrift/Thrift.h b/utils/thrift/thrift/Thrift.h index 5a7b1efb6..dd859de24 100644 --- a/utils/thrift/thrift/Thrift.h +++ b/utils/thrift/thrift/Thrift.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_THRIFT_H_ -#define _THRIFT_THRIFT_H_ 1 +#pragma once #include @@ -225,4 +224,3 @@ void profile_write_pprof(FILE* gen_calls_f, FILE* virtual_calls_f); } } // apache::thrift -#endif // #ifndef _THRIFT_THRIFT_H_ diff --git a/utils/thrift/thrift/async/TAsyncBufferProcessor.h b/utils/thrift/thrift/async/TAsyncBufferProcessor.h index 8854a18d3..8302837c3 100644 --- a/utils/thrift/thrift/async/TAsyncBufferProcessor.h +++ b/utils/thrift/thrift/async/TAsyncBufferProcessor.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TASYNC_BUFFER_PROCESSOR_H_ -#define _THRIFT_TASYNC_BUFFER_PROCESSOR_H_ 1 +#pragma once #include #include @@ -51,4 +50,3 @@ public: } } // apache::thrift::async -#endif // #ifndef _THRIFT_TASYNC_BUFFER_PROCESSOR_H_ diff --git a/utils/thrift/thrift/async/TAsyncChannel.h b/utils/thrift/thrift/async/TAsyncChannel.h index 27c9afd61..ff66923b1 100644 --- a/utils/thrift/thrift/async/TAsyncChannel.h +++ b/utils/thrift/thrift/async/TAsyncChannel.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_ASYNC_TASYNCCHANNEL_H_ -#define _THRIFT_ASYNC_TASYNCCHANNEL_H_ 1 +#pragma once #include #include @@ -78,4 +77,3 @@ public: } } // apache::thrift::async -#endif // #ifndef _THRIFT_ASYNC_TASYNCCHANNEL_H_ diff --git a/utils/thrift/thrift/async/TAsyncDispatchProcessor.h b/utils/thrift/thrift/async/TAsyncDispatchProcessor.h index 708c2bf76..4867f0848 100644 --- a/utils/thrift/thrift/async/TAsyncDispatchProcessor.h +++ b/utils/thrift/thrift/async/TAsyncDispatchProcessor.h @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -#ifndef _THRIFT_ASYNC_TASYNCDISPATCHPROCESSOR_H_ -#define _THRIFT_ASYNC_TASYNCDISPATCHPROCESSOR_H_ 1 +#pragma once #include @@ -163,4 +162,3 @@ class TAsyncDispatchProcessorT : } } // apache::thrift::async -#endif // _THRIFT_ASYNC_TASYNCDISPATCHPROCESSOR_H_ diff --git a/utils/thrift/thrift/async/TAsyncProcessor.h b/utils/thrift/thrift/async/TAsyncProcessor.h index 8b53c1a11..3cafbcd76 100644 --- a/utils/thrift/thrift/async/TAsyncProcessor.h +++ b/utils/thrift/thrift/async/TAsyncProcessor.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TASYNCPROCESSOR_H_ -#define _THRIFT_TASYNCPROCESSOR_H_ 1 +#pragma once #include #include @@ -112,4 +111,3 @@ using apache::thrift::async::TAsyncProcessor; } } -#endif // #ifndef _THRIFT_TASYNCPROCESSOR_H_ diff --git a/utils/thrift/thrift/async/TAsyncProtocolProcessor.h b/utils/thrift/thrift/async/TAsyncProtocolProcessor.h index 9205d350c..1be1809c0 100644 --- a/utils/thrift/thrift/async/TAsyncProtocolProcessor.h +++ b/utils/thrift/thrift/async/TAsyncProtocolProcessor.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TNAME_ME_H_ -#define _THRIFT_TNAME_ME_H_ 1 +#pragma once #include #include @@ -62,4 +61,3 @@ private: } } // apache::thrift::async -#endif // #ifndef _THRIFT_TNAME_ME_H_ diff --git a/utils/thrift/thrift/async/TEvhttpClientChannel.h b/utils/thrift/thrift/async/TEvhttpClientChannel.h index 6e747a0f4..06b0a7f1c 100644 --- a/utils/thrift/thrift/async/TEvhttpClientChannel.h +++ b/utils/thrift/thrift/async/TEvhttpClientChannel.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TEVHTTP_CLIENT_CHANNEL_H_ -#define _THRIFT_TEVHTTP_CLIENT_CHANNEL_H_ 1 +#pragma once #include #include @@ -97,4 +96,3 @@ private: } } // apache::thrift::async -#endif // #ifndef _THRIFT_TEVHTTP_CLIENT_CHANNEL_H_ diff --git a/utils/thrift/thrift/async/TEvhttpServer.h b/utils/thrift/thrift/async/TEvhttpServer.h index bcabde5e5..10da61f8a 100644 --- a/utils/thrift/thrift/async/TEvhttpServer.h +++ b/utils/thrift/thrift/async/TEvhttpServer.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TEVHTTP_SERVER_H_ -#define _THRIFT_TEVHTTP_SERVER_H_ 1 +#pragma once #include @@ -76,4 +75,3 @@ private: } } // apache::thrift::async -#endif // #ifndef _THRIFT_TEVHTTP_SERVER_H_ diff --git a/utils/thrift/thrift/concurrency/BoostThreadFactory.h b/utils/thrift/thrift/concurrency/BoostThreadFactory.h index 43a25bc5b..11c6b672c 100644 --- a/utils/thrift/thrift/concurrency/BoostThreadFactory.h +++ b/utils/thrift/thrift/concurrency/BoostThreadFactory.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_CONCURRENCY_BOOSTTHREADFACTORY_H_ -#define _THRIFT_CONCURRENCY_BOOSTTHREADFACTORY_H_ 1 +#pragma once #include @@ -80,4 +79,3 @@ private: } } // apache::thrift::concurrency -#endif // #ifndef _THRIFT_CONCURRENCY_BOOSTTHREADFACTORY_H_ diff --git a/utils/thrift/thrift/concurrency/Exception.h b/utils/thrift/thrift/concurrency/Exception.h index b4eedba21..f5aea687e 100644 --- a/utils/thrift/thrift/concurrency/Exception.h +++ b/utils/thrift/thrift/concurrency/Exception.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_CONCURRENCY_EXCEPTION_H_ -#define _THRIFT_CONCURRENCY_EXCEPTION_H_ 1 +#pragma once #include #include @@ -72,4 +71,3 @@ public: } } // apache::thrift::concurrency -#endif // #ifndef _THRIFT_CONCURRENCY_EXCEPTION_H_ diff --git a/utils/thrift/thrift/concurrency/FunctionRunner.h b/utils/thrift/thrift/concurrency/FunctionRunner.h index 129b47e62..7caa69cf8 100644 --- a/utils/thrift/thrift/concurrency/FunctionRunner.h +++ b/utils/thrift/thrift/concurrency/FunctionRunner.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_CONCURRENCY_FUNCTION_RUNNER_H -#define _THRIFT_CONCURRENCY_FUNCTION_RUNNER_H 1 +#pragma once #include #include @@ -133,4 +132,3 @@ private: } } // apache::thrift::concurrency -#endif // #ifndef _THRIFT_CONCURRENCY_FUNCTION_RUNNER_H diff --git a/utils/thrift/thrift/concurrency/Monitor.h b/utils/thrift/thrift/concurrency/Monitor.h index f5aa814aa..ac325da98 100644 --- a/utils/thrift/thrift/concurrency/Monitor.h +++ b/utils/thrift/thrift/concurrency/Monitor.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_CONCURRENCY_MONITOR_H_ -#define _THRIFT_CONCURRENCY_MONITOR_H_ 1 +#pragma once #include #include @@ -136,4 +135,3 @@ private: } } // apache::thrift::concurrency -#endif // #ifndef _THRIFT_CONCURRENCY_MONITOR_H_ diff --git a/utils/thrift/thrift/concurrency/Mutex.h b/utils/thrift/thrift/concurrency/Mutex.h index d22307556..4e14a391f 100644 --- a/utils/thrift/thrift/concurrency/Mutex.h +++ b/utils/thrift/thrift/concurrency/Mutex.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_CONCURRENCY_MUTEX_H_ -#define _THRIFT_CONCURRENCY_MUTEX_H_ 1 +#pragma once #include #include @@ -218,4 +217,3 @@ private: } } // apache::thrift::concurrency -#endif // #ifndef _THRIFT_CONCURRENCY_MUTEX_H_ diff --git a/utils/thrift/thrift/concurrency/PlatformThreadFactory.h b/utils/thrift/thrift/concurrency/PlatformThreadFactory.h index 34e2ed6ba..b269d0878 100644 --- a/utils/thrift/thrift/concurrency/PlatformThreadFactory.h +++ b/utils/thrift/thrift/concurrency/PlatformThreadFactory.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_CONCURRENCY_PLATFORMTHREADFACTORY_H_ -#define _THRIFT_CONCURRENCY_PLATFORMTHREADFACTORY_H_ 1 +#pragma once #include #if USE_BOOST_THREAD @@ -48,4 +47,3 @@ typedef PosixThreadFactory PlatformThreadFactory; } } // apache::thrift::concurrency -#endif // #ifndef _THRIFT_CONCURRENCY_PLATFORMTHREADFACTORY_H_ diff --git a/utils/thrift/thrift/concurrency/PosixThreadFactory.h b/utils/thrift/thrift/concurrency/PosixThreadFactory.h index 362280c0f..bf7fb1850 100644 --- a/utils/thrift/thrift/concurrency/PosixThreadFactory.h +++ b/utils/thrift/thrift/concurrency/PosixThreadFactory.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_CONCURRENCY_POSIXTHREADFACTORY_H_ -#define _THRIFT_CONCURRENCY_POSIXTHREADFACTORY_H_ 1 +#pragma once #include @@ -137,4 +136,3 @@ private: } } // apache::thrift::concurrency -#endif // #ifndef _THRIFT_CONCURRENCY_POSIXTHREADFACTORY_H_ diff --git a/utils/thrift/thrift/concurrency/StdThreadFactory.h b/utils/thrift/thrift/concurrency/StdThreadFactory.h index 99986112c..ce939948d 100644 --- a/utils/thrift/thrift/concurrency/StdThreadFactory.h +++ b/utils/thrift/thrift/concurrency/StdThreadFactory.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_CONCURRENCY_STDTHREADFACTORY_H_ -#define _THRIFT_CONCURRENCY_STDTHREADFACTORY_H_ 1 +#pragma once #include @@ -77,4 +76,3 @@ private: } } // apache::thrift::concurrency -#endif // #ifndef _THRIFT_CONCURRENCY_STDTHREADFACTORY_H_ diff --git a/utils/thrift/thrift/concurrency/Thread.h b/utils/thrift/thrift/concurrency/Thread.h index 2d9fc3d05..ce732e701 100644 --- a/utils/thrift/thrift/concurrency/Thread.h +++ b/utils/thrift/thrift/concurrency/Thread.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_CONCURRENCY_THREAD_H_ -#define _THRIFT_CONCURRENCY_THREAD_H_ 1 +#pragma once #include #include @@ -189,4 +188,3 @@ public: } } // apache::thrift::concurrency -#endif // #ifndef _THRIFT_CONCURRENCY_THREAD_H_ diff --git a/utils/thrift/thrift/concurrency/ThreadManager.h b/utils/thrift/thrift/concurrency/ThreadManager.h index d67b90ad5..9472c1725 100644 --- a/utils/thrift/thrift/concurrency/ThreadManager.h +++ b/utils/thrift/thrift/concurrency/ThreadManager.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_CONCURRENCY_THREADMANAGER_H_ -#define _THRIFT_CONCURRENCY_THREADMANAGER_H_ 1 +#pragma once #include #include @@ -208,4 +207,3 @@ public: } } // apache::thrift::concurrency -#endif // #ifndef _THRIFT_CONCURRENCY_THREADMANAGER_H_ diff --git a/utils/thrift/thrift/concurrency/TimerManager.h b/utils/thrift/thrift/concurrency/TimerManager.h index 8dddbeb7d..934239b6b 100644 --- a/utils/thrift/thrift/concurrency/TimerManager.h +++ b/utils/thrift/thrift/concurrency/TimerManager.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_CONCURRENCY_TIMERMANAGER_H_ -#define _THRIFT_CONCURRENCY_TIMERMANAGER_H_ 1 +#pragma once #include #include @@ -136,4 +135,3 @@ private: } } // apache::thrift::concurrency -#endif // #ifndef _THRIFT_CONCURRENCY_TIMERMANAGER_H_ diff --git a/utils/thrift/thrift/concurrency/Util.h b/utils/thrift/thrift/concurrency/Util.h index 1c0c33e3d..f53cb8d4d 100644 --- a/utils/thrift/thrift/concurrency/Util.h +++ b/utils/thrift/thrift/concurrency/Util.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_CONCURRENCY_UTIL_H_ -#define _THRIFT_CONCURRENCY_UTIL_H_ 1 +#pragma once #include #include @@ -174,4 +173,3 @@ public: } } // apache::thrift::concurrency -#endif // #ifndef _THRIFT_CONCURRENCY_UTIL_H_ diff --git a/utils/thrift/thrift/cxxfunctional.h b/utils/thrift/thrift/cxxfunctional.h index 89a826be9..d1ceefe75 100644 --- a/utils/thrift/thrift/cxxfunctional.h +++ b/utils/thrift/thrift/cxxfunctional.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_CXXFUNCTIONAL_H_ -#define _THRIFT_CXXFUNCTIONAL_H_ 1 +#pragma once /** * Loads from the 'right' location, depending @@ -147,4 +146,3 @@ using ::std::tr1::placeholders::_6; // Alias for thrift c++ compatibility namespace namespace tcxx = apache::thrift::stdcxx; -#endif // #ifndef _THRIFT_CXXFUNCTIONAL_H_ diff --git a/utils/thrift/thrift/processor/PeekProcessor.h b/utils/thrift/thrift/processor/PeekProcessor.h index 837d64509..93c0aa584 100644 --- a/utils/thrift/thrift/processor/PeekProcessor.h +++ b/utils/thrift/thrift/processor/PeekProcessor.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef PEEKPROCESSOR_H -#define PEEKPROCESSOR_H +#pragma once #include #include @@ -83,4 +82,3 @@ private: } } // apache::thrift::processor -#endif diff --git a/utils/thrift/thrift/processor/StatsProcessor.h b/utils/thrift/thrift/processor/StatsProcessor.h index e8f46ab0c..d63e82195 100644 --- a/utils/thrift/thrift/processor/StatsProcessor.h +++ b/utils/thrift/thrift/processor/StatsProcessor.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef STATSPROCESSOR_H -#define STATSPROCESSOR_H +#pragma once #include #include @@ -361,4 +360,3 @@ protected: } } // apache::thrift::processor -#endif diff --git a/utils/thrift/thrift/processor/TMultiplexedProcessor.h b/utils/thrift/thrift/processor/TMultiplexedProcessor.h index 6a99bca1e..e8f5d90fe 100644 --- a/utils/thrift/thrift/processor/TMultiplexedProcessor.h +++ b/utils/thrift/thrift/processor/TMultiplexedProcessor.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef THRIFT_TMULTIPLEXEDPROCESSOR_H_ -#define THRIFT_TMULTIPLEXEDPROCESSOR_H_ 1 +#pragma once #include #include @@ -218,4 +217,3 @@ private: } } -#endif // THRIFT_TMULTIPLEXEDPROCESSOR_H_ diff --git a/utils/thrift/thrift/protocol/TBase64Utils.h b/utils/thrift/thrift/protocol/TBase64Utils.h index 46922d6c3..9e38344b8 100644 --- a/utils/thrift/thrift/protocol/TBase64Utils.h +++ b/utils/thrift/thrift/protocol/TBase64Utils.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_PROTOCOL_TBASE64UTILS_H_ -#define _THRIFT_PROTOCOL_TBASE64UTILS_H_ +#pragma once #include #include @@ -46,4 +45,3 @@ void base64_decode(uint8_t* buf, uint32_t len); } } // apache::thrift::protocol -#endif // #define _THRIFT_PROTOCOL_TBASE64UTILS_H_ diff --git a/utils/thrift/thrift/protocol/TBinaryProtocol.h b/utils/thrift/thrift/protocol/TBinaryProtocol.h index 3a468634e..8f208c649 100644 --- a/utils/thrift/thrift/protocol/TBinaryProtocol.h +++ b/utils/thrift/thrift/protocol/TBinaryProtocol.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_PROTOCOL_TBINARYPROTOCOL_H_ -#define _THRIFT_PROTOCOL_TBINARYPROTOCOL_H_ 1 +#pragma once #include #include @@ -301,4 +300,3 @@ typedef TBinaryProtocolFactoryT TBinaryProtocolFactory; #include -#endif // #ifndef _THRIFT_PROTOCOL_TBINARYPROTOCOL_H_ diff --git a/utils/thrift/thrift/protocol/TCompactProtocol.h b/utils/thrift/thrift/protocol/TCompactProtocol.h index 723719620..ece64b445 100644 --- a/utils/thrift/thrift/protocol/TCompactProtocol.h +++ b/utils/thrift/thrift/protocol/TCompactProtocol.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_PROTOCOL_TCOMPACTPROTOCOL_H_ -#define _THRIFT_PROTOCOL_TCOMPACTPROTOCOL_H_ 1 +#pragma once #include @@ -337,4 +336,3 @@ typedef TCompactProtocolFactoryT TCompactProtocolFactory; #include -#endif diff --git a/utils/thrift/thrift/protocol/TDebugProtocol.h b/utils/thrift/thrift/protocol/TDebugProtocol.h index 14a58ef2e..d673619aa 100644 --- a/utils/thrift/thrift/protocol/TDebugProtocol.h +++ b/utils/thrift/thrift/protocol/TDebugProtocol.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_PROTOCOL_TDEBUGPROTOCOL_H_ -#define _THRIFT_PROTOCOL_TDEBUGPROTOCOL_H_ 1 +#pragma once #include @@ -244,6 +243,5 @@ std::string DebugString(const std::vector& vec) } // apache::thrift -#endif // #ifndef _THRIFT_PROTOCOL_TDEBUGPROTOCOL_H_ diff --git a/utils/thrift/thrift/protocol/TDenseProtocol.h b/utils/thrift/thrift/protocol/TDenseProtocol.h index ff0e38264..476b80838 100644 --- a/utils/thrift/thrift/protocol/TDenseProtocol.h +++ b/utils/thrift/thrift/protocol/TDenseProtocol.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_PROTOCOL_TDENSEPROTOCOL_H_ -#define _THRIFT_PROTOCOL_TDENSEPROTOCOL_H_ 1 +#pragma once #include @@ -264,4 +263,3 @@ private: } } // apache::thrift::protocol -#endif // #ifndef _THRIFT_PROTOCOL_TDENSEPROTOCOL_H_ diff --git a/utils/thrift/thrift/protocol/TJSONProtocol.h b/utils/thrift/thrift/protocol/TJSONProtocol.h index 050a71d21..9da9ecf29 100644 --- a/utils/thrift/thrift/protocol/TJSONProtocol.h +++ b/utils/thrift/thrift/protocol/TJSONProtocol.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_PROTOCOL_TJSONPROTOCOL_H_ -#define _THRIFT_PROTOCOL_TJSONPROTOCOL_H_ 1 +#pragma once #include @@ -360,4 +359,3 @@ std::string ThriftJSONString(const ThriftStruct& ts) } } // apache::thrift -#endif // #define _THRIFT_PROTOCOL_TJSONPROTOCOL_H_ 1 diff --git a/utils/thrift/thrift/protocol/TMultiplexedProtocol.h b/utils/thrift/thrift/protocol/TMultiplexedProtocol.h index 88f97050e..0756f3fd6 100644 --- a/utils/thrift/thrift/protocol/TMultiplexedProtocol.h +++ b/utils/thrift/thrift/protocol/TMultiplexedProtocol.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef THRIFT_TMULTIPLEXEDPROTOCOL_H_ -#define THRIFT_TMULTIPLEXEDPROTOCOL_H_ 1 +#pragma once #include @@ -100,4 +99,3 @@ private: } } -#endif // THRIFT_TMULTIPLEXEDPROTOCOL_H_ diff --git a/utils/thrift/thrift/protocol/TProtocol.h b/utils/thrift/thrift/protocol/TProtocol.h index e2b3f4857..b7a717095 100644 --- a/utils/thrift/thrift/protocol/TProtocol.h +++ b/utils/thrift/thrift/protocol/TProtocol.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_PROTOCOL_TPROTOCOL_H_ -#define _THRIFT_PROTOCOL_TPROTOCOL_H_ 1 +#pragma once #include #include @@ -789,4 +788,3 @@ class TDummyProtocol : public TProtocol } } // apache::thrift::protocol -#endif // #define _THRIFT_PROTOCOL_TPROTOCOL_H_ 1 diff --git a/utils/thrift/thrift/protocol/TProtocolDecorator.h b/utils/thrift/thrift/protocol/TProtocolDecorator.h index 8405febfe..2a20e5342 100644 --- a/utils/thrift/thrift/protocol/TProtocolDecorator.h +++ b/utils/thrift/thrift/protocol/TProtocolDecorator.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef THRIFT_TPROTOCOLDECORATOR_H_ -#define THRIFT_TPROTOCOLDECORATOR_H_ 1 +#pragma once #include #include @@ -253,4 +252,3 @@ private: } } -#endif // THRIFT_TPROTOCOLDECORATOR_H_ diff --git a/utils/thrift/thrift/protocol/TProtocolException.h b/utils/thrift/thrift/protocol/TProtocolException.h index 13bb7b865..9ab6ae4ea 100644 --- a/utils/thrift/thrift/protocol/TProtocolException.h +++ b/utils/thrift/thrift/protocol/TProtocolException.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_PROTOCOL_TPROTOCOLEXCEPTION_H_ -#define _THRIFT_PROTOCOL_TPROTOCOLEXCEPTION_H_ 1 +#pragma once #include @@ -129,4 +128,3 @@ protected: } } // apache::thrift::protocol -#endif // #ifndef _THRIFT_PROTOCOL_TPROTOCOLEXCEPTION_H_ diff --git a/utils/thrift/thrift/protocol/TProtocolTap.h b/utils/thrift/thrift/protocol/TProtocolTap.h index 107905c27..15801ca64 100644 --- a/utils/thrift/thrift/protocol/TProtocolTap.h +++ b/utils/thrift/thrift/protocol/TProtocolTap.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_PROTOCOL_TPROTOCOLTAP_H_ -#define _THRIFT_PROTOCOL_TPROTOCOLTAP_H_ 1 +#pragma once #include @@ -218,4 +217,3 @@ private: } } // apache::thrift::protocol -#endif // #define _THRIFT_PROTOCOL_TPROTOCOLTAP_H_ 1 diff --git a/utils/thrift/thrift/protocol/TVirtualProtocol.h b/utils/thrift/thrift/protocol/TVirtualProtocol.h index 9eb0bfe15..4ea5a3e81 100644 --- a/utils/thrift/thrift/protocol/TVirtualProtocol.h +++ b/utils/thrift/thrift/protocol/TVirtualProtocol.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_PROTOCOL_TVIRTUALPROTOCOL_H_ -#define _THRIFT_PROTOCOL_TVIRTUALPROTOCOL_H_ 1 +#pragma once #include @@ -658,4 +657,3 @@ protected: } } // apache::thrift::protocol -#endif // #define _THRIFT_PROTOCOL_TVIRTUALPROTOCOL_H_ 1 diff --git a/utils/thrift/thrift/qt/TQIODeviceTransport.h b/utils/thrift/thrift/qt/TQIODeviceTransport.h index 4f834f65a..1abb0c9ac 100644 --- a/utils/thrift/thrift/qt/TQIODeviceTransport.h +++ b/utils/thrift/thrift/qt/TQIODeviceTransport.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_ASYNC_TQIODEVICE_TRANSPORT_H_ -#define _THRIFT_ASYNC_TQIODEVICE_TRANSPORT_H_ 1 +#pragma once #include @@ -68,5 +67,4 @@ private: } } // apache::thrift::transport -#endif // #ifndef _THRIFT_ASYNC_TQIODEVICE_TRANSPORT_H_ diff --git a/utils/thrift/thrift/qt/TQTcpServer.h b/utils/thrift/thrift/qt/TQTcpServer.h index 36a0e548d..7b7b515a7 100644 --- a/utils/thrift/thrift/qt/TQTcpServer.h +++ b/utils/thrift/thrift/qt/TQTcpServer.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TASYNC_QTCP_SERVER_H_ -#define _THRIFT_TASYNC_QTCP_SERVER_H_ +#pragma once #include #include @@ -84,4 +83,3 @@ private: } } // apache::thrift::async -#endif // #ifndef _THRIFT_TASYNC_QTCP_SERVER_H_ diff --git a/utils/thrift/thrift/server/TNonblockingServer.h b/utils/thrift/thrift/server/TNonblockingServer.h index ef44d7134..4d6e240c6 100644 --- a/utils/thrift/thrift/server/TNonblockingServer.h +++ b/utils/thrift/thrift/server/TNonblockingServer.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_SERVER_TNONBLOCKINGSERVER_H_ -#define _THRIFT_SERVER_TNONBLOCKINGSERVER_H_ 1 +#pragma once #include #include @@ -1028,4 +1027,3 @@ private: } } // apache::thrift::server -#endif // #ifndef _THRIFT_SERVER_TNONBLOCKINGSERVER_H_ diff --git a/utils/thrift/thrift/server/TServer.h b/utils/thrift/thrift/server/TServer.h index 76de8ea3e..11df5db2e 100644 --- a/utils/thrift/thrift/server/TServer.h +++ b/utils/thrift/thrift/server/TServer.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_SERVER_TSERVER_H_ -#define _THRIFT_SERVER_TSERVER_H_ 1 +#pragma once #include #include @@ -342,4 +341,3 @@ int increase_max_fds(int max_fds = (1 << 24)); } } // apache::thrift::server -#endif // #ifndef _THRIFT_SERVER_TSERVER_H_ diff --git a/utils/thrift/thrift/server/TSimpleServer.h b/utils/thrift/thrift/server/TSimpleServer.h index dfe7bf732..214fa9dbc 100644 --- a/utils/thrift/thrift/server/TSimpleServer.h +++ b/utils/thrift/thrift/server/TSimpleServer.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_SERVER_TSIMPLESERVER_H_ -#define _THRIFT_SERVER_TSIMPLESERVER_H_ 1 +#pragma once #include #include @@ -108,4 +107,3 @@ protected: } } // apache::thrift::server -#endif // #ifndef _THRIFT_SERVER_TSIMPLESERVER_H_ diff --git a/utils/thrift/thrift/server/TThreadPoolServer.h b/utils/thrift/thrift/server/TThreadPoolServer.h index ca766726e..b4363bce6 100644 --- a/utils/thrift/thrift/server/TThreadPoolServer.h +++ b/utils/thrift/thrift/server/TThreadPoolServer.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_SERVER_TTHREADPOOLSERVER_H_ -#define _THRIFT_SERVER_TTHREADPOOLSERVER_H_ 1 +#pragma once #include #include @@ -142,4 +141,3 @@ protected: } } // apache::thrift::server -#endif // #ifndef _THRIFT_SERVER_TTHREADPOOLSERVER_H_ diff --git a/utils/thrift/thrift/server/TThreadedServer.h b/utils/thrift/thrift/server/TThreadedServer.h index 6c50dc884..bcce69148 100644 --- a/utils/thrift/thrift/server/TThreadedServer.h +++ b/utils/thrift/thrift/server/TThreadedServer.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_SERVER_TTHREADEDSERVER_H_ -#define _THRIFT_SERVER_TTHREADEDSERVER_H_ 1 +#pragma once #include #include @@ -155,4 +154,3 @@ TThreadedServer::TThreadedServer( } } // apache::thrift::server -#endif // #ifndef _THRIFT_SERVER_TTHREADEDSERVER_H_ diff --git a/utils/thrift/thrift/thrift-config.h b/utils/thrift/thrift/thrift-config.h index e60e4c1ca..c0bf6b10c 100644 --- a/utils/thrift/thrift/thrift-config.h +++ b/utils/thrift/thrift/thrift-config.h @@ -2,8 +2,7 @@ /* config.hin. Generated from configure.ac by autoheader. */ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once /* Define if the AI_ADDRCONFIG symbol is unavailable */ @@ -423,5 +422,4 @@ /* #undef volatile */ -#endif diff --git a/utils/thrift/thrift/transport/PlatformSocket.h b/utils/thrift/thrift/transport/PlatformSocket.h index 58d68a47e..cf9fe8db9 100644 --- a/utils/thrift/thrift/transport/PlatformSocket.h +++ b/utils/thrift/thrift/transport/PlatformSocket.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_PLATFORM_SOCKET_H_ -# define _THRIFT_TRANSPORT_PLATFORM_SOCKET_H_ +#pragma once #ifdef _WIN32 # define THRIFT_GET_SOCKET_ERROR ::WSAGetLastError() @@ -93,4 +92,3 @@ # define THRIFT_SHUT_RDWR SHUT_RDWR #endif -#endif // _THRIFT_TRANSPORT_PLATFORM_SOCKET_H_ diff --git a/utils/thrift/thrift/transport/TBufferTransports.h b/utils/thrift/thrift/transport/TBufferTransports.h index be9db7387..d5b72880b 100644 --- a/utils/thrift/thrift/transport/TBufferTransports.h +++ b/utils/thrift/thrift/transport/TBufferTransports.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TBUFFERTRANSPORTS_H_ -#define _THRIFT_TRANSPORT_TBUFFERTRANSPORTS_H_ 1 +#pragma once #include #include @@ -823,4 +822,3 @@ protected: } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_TBUFFERTRANSPORTS_H_ diff --git a/utils/thrift/thrift/transport/TFDTransport.h b/utils/thrift/thrift/transport/TFDTransport.h index 7fb89797e..4713f4244 100644 --- a/utils/thrift/thrift/transport/TFDTransport.h +++ b/utils/thrift/thrift/transport/TFDTransport.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TFDTRANSPORT_H_ -#define _THRIFT_TRANSPORT_TFDTRANSPORT_H_ 1 +#pragma once #include #ifdef HAVE_SYS_TIME_H @@ -92,4 +91,3 @@ protected: } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_TFDTRANSPORT_H_ diff --git a/utils/thrift/thrift/transport/TFileTransport.h b/utils/thrift/thrift/transport/TFileTransport.h index f7554d2f0..828224f0d 100644 --- a/utils/thrift/thrift/transport/TFileTransport.h +++ b/utils/thrift/thrift/transport/TFileTransport.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TFILETRANSPORT_H_ -#define _THRIFT_TRANSPORT_TFILETRANSPORT_H_ 1 +#pragma once #include #include @@ -528,4 +527,3 @@ private: } } // apache::thrift::transport -#endif // _THRIFT_TRANSPORT_TFILETRANSPORT_H_ diff --git a/utils/thrift/thrift/transport/THttpClient.h b/utils/thrift/thrift/transport/THttpClient.h index 8258651d0..0f10c532d 100644 --- a/utils/thrift/thrift/transport/THttpClient.h +++ b/utils/thrift/thrift/transport/THttpClient.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_THTTPCLIENT_H_ -#define _THRIFT_TRANSPORT_THTTPCLIENT_H_ 1 +#pragma once #include @@ -54,4 +53,3 @@ protected: } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_THTTPCLIENT_H_ diff --git a/utils/thrift/thrift/transport/THttpServer.h b/utils/thrift/thrift/transport/THttpServer.h index e65c82ef9..81cc70d6c 100644 --- a/utils/thrift/thrift/transport/THttpServer.h +++ b/utils/thrift/thrift/transport/THttpServer.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_THTTPSERVER_H_ -#define _THRIFT_TRANSPORT_THTTPSERVER_H_ 1 +#pragma once #include @@ -71,4 +70,3 @@ public: } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_THTTPSERVER_H_ diff --git a/utils/thrift/thrift/transport/THttpTransport.h b/utils/thrift/thrift/transport/THttpTransport.h index 6278cf679..d9d4b7dd6 100644 --- a/utils/thrift/thrift/transport/THttpTransport.h +++ b/utils/thrift/thrift/transport/THttpTransport.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_THTTPTRANSPORT_H_ -#define _THRIFT_TRANSPORT_THTTPTRANSPORT_H_ 1 +#pragma once #include #include @@ -116,4 +115,3 @@ protected: } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_THTTPCLIENT_H_ diff --git a/utils/thrift/thrift/transport/TPipe.h b/utils/thrift/thrift/transport/TPipe.h index 87265ec1b..bac8a09bb 100644 --- a/utils/thrift/thrift/transport/TPipe.h +++ b/utils/thrift/thrift/transport/TPipe.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TPIPE_H_ -#define _THRIFT_TRANSPORT_TPIPE_H_ 1 +#pragma once #include #include @@ -100,5 +99,4 @@ typedef TSocket TPipe; } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_TPIPE_H_ diff --git a/utils/thrift/thrift/transport/TPipeServer.h b/utils/thrift/thrift/transport/TPipeServer.h index 90cffcd4f..cc3c30c73 100644 --- a/utils/thrift/thrift/transport/TPipeServer.h +++ b/utils/thrift/thrift/transport/TPipeServer.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TSERVERWINPIPES_H_ -#define _THRIFT_TRANSPORT_TSERVERWINPIPES_H_ 1 +#pragma once #include #include @@ -98,4 +97,3 @@ typedef TServerSocket TPipeServer; } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_TSERVERWINPIPES_H_ diff --git a/utils/thrift/thrift/transport/TSSLServerSocket.h b/utils/thrift/thrift/transport/TSSLServerSocket.h index ca20d10b0..95d0129bd 100644 --- a/utils/thrift/thrift/transport/TSSLServerSocket.h +++ b/utils/thrift/thrift/transport/TSSLServerSocket.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TSSLSERVERSOCKET_H_ -#define _THRIFT_TRANSPORT_TSSLSERVERSOCKET_H_ 1 +#pragma once #include #include @@ -64,4 +63,3 @@ protected: } } -#endif diff --git a/utils/thrift/thrift/transport/TSSLSocket.h b/utils/thrift/thrift/transport/TSSLSocket.h index f6b7af54c..9ecf57d47 100644 --- a/utils/thrift/thrift/transport/TSSLSocket.h +++ b/utils/thrift/thrift/transport/TSSLSocket.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TSSLSOCKET_H_ -#define _THRIFT_TRANSPORT_TSSLSOCKET_H_ 1 +#pragma once #include #include @@ -356,4 +355,3 @@ public: } } -#endif diff --git a/utils/thrift/thrift/transport/TServerSocket.h b/utils/thrift/thrift/transport/TServerSocket.h index 449c1f07f..1a9060f10 100644 --- a/utils/thrift/thrift/transport/TServerSocket.h +++ b/utils/thrift/thrift/transport/TServerSocket.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TSERVERSOCKET_H_ -#define _THRIFT_TRANSPORT_TSERVERSOCKET_H_ 1 +#pragma once #include #include @@ -91,4 +90,3 @@ private: } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_TSERVERSOCKET_H_ diff --git a/utils/thrift/thrift/transport/TServerTransport.h b/utils/thrift/thrift/transport/TServerTransport.h index 5c56340f2..4e6e906e4 100644 --- a/utils/thrift/thrift/transport/TServerTransport.h +++ b/utils/thrift/thrift/transport/TServerTransport.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TSERVERTRANSPORT_H_ -#define _THRIFT_TRANSPORT_TSERVERTRANSPORT_H_ 1 +#pragma once #include #include @@ -101,4 +100,3 @@ protected: } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_TSERVERTRANSPORT_H_ diff --git a/utils/thrift/thrift/transport/TShortReadTransport.h b/utils/thrift/thrift/transport/TShortReadTransport.h index ba6afd514..bda75ffb8 100644 --- a/utils/thrift/thrift/transport/TShortReadTransport.h +++ b/utils/thrift/thrift/transport/TShortReadTransport.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TSHORTREADTRANSPORT_H_ -#define _THRIFT_TRANSPORT_TSHORTREADTRANSPORT_H_ 1 +#pragma once #include @@ -118,4 +117,3 @@ protected: } } // apache::thrift::transport::test -#endif // #ifndef _THRIFT_TRANSPORT_TSHORTREADTRANSPORT_H_ diff --git a/utils/thrift/thrift/transport/TSimpleFileTransport.h b/utils/thrift/thrift/transport/TSimpleFileTransport.h index ac8d2beb7..ae4adc803 100644 --- a/utils/thrift/thrift/transport/TSimpleFileTransport.h +++ b/utils/thrift/thrift/transport/TSimpleFileTransport.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TSIMPLEFILETRANSPORT_H_ -#define _THRIFT_TRANSPORT_TSIMPLEFILETRANSPORT_H_ 1 +#pragma once #include @@ -46,4 +45,3 @@ public: } } // apache::thrift::transport -#endif // _THRIFT_TRANSPORT_TSIMPLEFILETRANSPORT_H_ diff --git a/utils/thrift/thrift/transport/TSocket.h b/utils/thrift/thrift/transport/TSocket.h index 46858c6b1..a857811da 100644 --- a/utils/thrift/thrift/transport/TSocket.h +++ b/utils/thrift/thrift/transport/TSocket.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TSOCKET_H_ -#define _THRIFT_TRANSPORT_TSOCKET_H_ 1 +#pragma once #include @@ -315,5 +314,4 @@ private: } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_TSOCKET_H_ diff --git a/utils/thrift/thrift/transport/TSocketPool.h b/utils/thrift/thrift/transport/TSocketPool.h index d9b5bb0f8..71d7339de 100644 --- a/utils/thrift/thrift/transport/TSocketPool.h +++ b/utils/thrift/thrift/transport/TSocketPool.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TSOCKETPOOL_H_ -#define _THRIFT_TRANSPORT_TSOCKETPOOL_H_ 1 +#pragma once #include #include @@ -201,5 +200,4 @@ protected: } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_TSOCKETPOOL_H_ diff --git a/utils/thrift/thrift/transport/TTransport.h b/utils/thrift/thrift/transport/TTransport.h index 3a07be5b3..aa741c3ec 100644 --- a/utils/thrift/thrift/transport/TTransport.h +++ b/utils/thrift/thrift/transport/TTransport.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TTRANSPORT_H_ -#define _THRIFT_TRANSPORT_TTRANSPORT_H_ 1 +#pragma once #include #include @@ -299,4 +298,3 @@ public: } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_TTRANSPORT_H_ diff --git a/utils/thrift/thrift/transport/TTransportException.h b/utils/thrift/thrift/transport/TTransportException.h index 1c3e483db..47b554378 100644 --- a/utils/thrift/thrift/transport/TTransportException.h +++ b/utils/thrift/thrift/transport/TTransportException.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TTRANSPORTEXCEPTION_H_ -#define _THRIFT_TRANSPORT_TTRANSPORTEXCEPTION_H_ 1 +#pragma once #include #include @@ -144,4 +143,3 @@ protected: } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_TTRANSPORTEXCEPTION_H_ diff --git a/utils/thrift/thrift/transport/TTransportUtils.h b/utils/thrift/thrift/transport/TTransportUtils.h index 65372d576..b5ebe9e4d 100644 --- a/utils/thrift/thrift/transport/TTransportUtils.h +++ b/utils/thrift/thrift/transport/TTransportUtils.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TTRANSPORTUTILS_H_ -#define _THRIFT_TRANSPORT_TTRANSPORTUTILS_H_ 1 +#pragma once #include #include @@ -386,4 +385,3 @@ public: } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_TTRANSPORTUTILS_H_ diff --git a/utils/thrift/thrift/transport/TVirtualTransport.h b/utils/thrift/thrift/transport/TVirtualTransport.h index 72a8e0c1c..29fadc2a2 100644 --- a/utils/thrift/thrift/transport/TVirtualTransport.h +++ b/utils/thrift/thrift/transport/TVirtualTransport.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TVIRTUALTRANSPORT_H_ -#define _THRIFT_TRANSPORT_TVIRTUALTRANSPORT_H_ 1 +#pragma once #include @@ -163,4 +162,3 @@ protected: } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_TVIRTUALTRANSPORT_H_ diff --git a/utils/thrift/thrift/transport/TZlibTransport.h b/utils/thrift/thrift/transport/TZlibTransport.h index c730862c5..4f4739c71 100644 --- a/utils/thrift/thrift/transport/TZlibTransport.h +++ b/utils/thrift/thrift/transport/TZlibTransport.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_TZLIBTRANSPORT_H_ -#define _THRIFT_TRANSPORT_TZLIBTRANSPORT_H_ 1 +#pragma once #include #include @@ -275,4 +274,3 @@ public: } } // apache::thrift::transport -#endif // #ifndef _THRIFT_TRANSPORT_TZLIBTRANSPORT_H_ diff --git a/utils/thrift/thrift/windows/GetTimeOfDay.h b/utils/thrift/thrift/windows/GetTimeOfDay.h index 743ba8305..e98f6fe7d 100644 --- a/utils/thrift/thrift/windows/GetTimeOfDay.h +++ b/utils/thrift/thrift/windows/GetTimeOfDay.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_WINDOWS_GETTIMEOFDAY_H_ -#define _THRIFT_WINDOWS_GETTIMEOFDAY_H_ +#pragma once #if defined(_MSC_VER) && (_MSC_VER > 1200) #pragma once @@ -41,4 +40,3 @@ int thrift_sleep(unsigned int seconds); int thrift_usleep(unsigned int micro_seconds); char* thrift_ctime_r(const time_t* _clock, char* _buf); -#endif // _THRIFT_WINDOWS_GETTIMEOFDAY_H_ diff --git a/utils/thrift/thrift/windows/Operators.h b/utils/thrift/thrift/windows/Operators.h index 970e41b00..b2e95d3dc 100644 --- a/utils/thrift/thrift/windows/Operators.h +++ b/utils/thrift/thrift/windows/Operators.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_WINDOWS_OPERATORS_H_ -#define _THRIFT_WINDOWS_OPERATORS_H_ +#pragma once #if defined(_MSC_VER) && (_MSC_VER > 1200) #pragma once @@ -41,4 +40,3 @@ inline bool operator == (const TEnumIterator&, const TEnumIterator&) } } // apache::thrift -#endif // _THRIFT_WINDOWS_OPERATORS_H_ diff --git a/utils/thrift/thrift/windows/SocketPair.h b/utils/thrift/thrift/windows/SocketPair.h index 86bf43150..471ecaa37 100644 --- a/utils/thrift/thrift/windows/SocketPair.h +++ b/utils/thrift/thrift/windows/SocketPair.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_WINDOWS_SOCKETPAIR_H_ -#define _THRIFT_WINDOWS_SOCKETPAIR_H_ 1 +#pragma once #if defined(_MSC_VER) && (_MSC_VER > 1200) #pragma once @@ -34,4 +33,3 @@ int thrift_socketpair(int d, int type, int protocol, THRIFT_SOCKET sv[2]); -#endif // _THRIFT_WINDOWS_SOCKETPAIR_H_ diff --git a/utils/thrift/thrift/windows/TWinsockSingleton.h b/utils/thrift/thrift/windows/TWinsockSingleton.h index a623094eb..5a95bdcd0 100644 --- a/utils/thrift/thrift/windows/TWinsockSingleton.h +++ b/utils/thrift/thrift/windows/TWinsockSingleton.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_TRANSPORT_WINDOWS_TWINSOCKSINGLETON_H_ -#define _THRIFT_TRANSPORT_WINDOWS_TWINSOCKSINGLETON_H_ 1 +#pragma once #if defined(_MSC_VER) && (_MSC_VER > 1200) #pragma once @@ -92,4 +91,3 @@ private: } } // apache::thrift::transport -#endif // _THRIFT_TRANSPORT_WINDOWS_TWINSOCKSINGLETON_H_ diff --git a/utils/thrift/thrift/windows/WinFcntl.h b/utils/thrift/thrift/windows/WinFcntl.h index 669cae367..39be4ed5c 100644 --- a/utils/thrift/thrift/windows/WinFcntl.h +++ b/utils/thrift/thrift/windows/WinFcntl.h @@ -17,8 +17,7 @@ * under the License. */ -#ifndef _THRIFT_WINDOWS_FCNTL_H_ -#define _THRIFT_WINDOWS_FCNTL_H_ 1 +#pragma once #if defined(_MSC_VER) && (_MSC_VER > 1200) #pragma once @@ -46,4 +45,3 @@ extern "C" { int thrift_poll(THRIFT_POLLFD* fdArray, ULONG nfds, INT timeout); } -#endif // _THRIFT_WINDOWS_FCNTL_H_ diff --git a/utils/udfsdk/allnull.h b/utils/udfsdk/allnull.h index 203bfbbaf..a811fca40 100644 --- a/utils/udfsdk/allnull.h +++ b/utils/udfsdk/allnull.h @@ -42,8 +42,7 @@ * 'libudf_mysql.so'; * */ -#ifndef HEADER_allnull -#define HEADER_allnull +#pragma once #include #include @@ -194,5 +193,4 @@ protected: #undef EXPORT -#endif // HEADER_allnull.h diff --git a/utils/udfsdk/avg_mode.h b/utils/udfsdk/avg_mode.h index da0962c7f..a657e00e2 100644 --- a/utils/udfsdk/avg_mode.h +++ b/utils/udfsdk/avg_mode.h @@ -50,8 +50,7 @@ * is also used to describe the interface that is used for * either. */ -#ifndef HEADER_avg_mode -#define HEADER_avg_mode +#pragma once #include #include @@ -276,5 +275,4 @@ protected: #undef EXPORT -#endif // HEADER_mode.h diff --git a/utils/udfsdk/avgx.h b/utils/udfsdk/avgx.h index 61d3d02b6..4fee27646 100644 --- a/utils/udfsdk/avgx.h +++ b/utils/udfsdk/avgx.h @@ -29,8 +29,7 @@ * 'libudf_mysql.so'; * */ -#ifndef HEADER_avgx -#define HEADER_avgx +#pragma once #include #include @@ -93,5 +92,4 @@ protected: #undef EXPORT -#endif // HEADER_.h diff --git a/utils/udfsdk/distinct_count.h b/utils/udfsdk/distinct_count.h index 5e0fa84ac..d22991b12 100644 --- a/utils/udfsdk/distinct_count.h +++ b/utils/udfsdk/distinct_count.h @@ -42,8 +42,7 @@ * soname 'libudf_mysql.so'; * */ -#ifndef HEADER_distinct_count -#define HEADER_distinct_count +#pragma once #include #include @@ -217,5 +216,4 @@ protected: #undef EXPORT -#endif // HEADER_distinct_count.h diff --git a/utils/udfsdk/mcsv1_udaf.h b/utils/udfsdk/mcsv1_udaf.h index caf7393d4..e9fb2e865 100755 --- a/utils/udfsdk/mcsv1_udaf.h +++ b/utils/udfsdk/mcsv1_udaf.h @@ -60,8 +60,7 @@ * either. */ -#ifndef HEADER_mcsv1_udaf -#define HEADER_mcsv1_udaf +#pragma once #include #include @@ -1089,5 +1088,4 @@ inline T mcsv1_UDAF::convertAnyTo(static_any::any& valIn) const #undef EXPORT -#endif // HEADER_mcsv1_udaf.h diff --git a/utils/udfsdk/median.h b/utils/udfsdk/median.h index 5ae3025dd..068f9ffac 100644 --- a/utils/udfsdk/median.h +++ b/utils/udfsdk/median.h @@ -50,8 +50,7 @@ * is also used to describe the interface that is used for * either. */ -#ifndef HEADER_median -#define HEADER_median +#pragma once #include #include @@ -276,5 +275,4 @@ protected: #undef EXPORT -#endif // HEADER_median.h diff --git a/utils/udfsdk/ssq.h b/utils/udfsdk/ssq.h index c291d7fd1..29014c4f2 100644 --- a/utils/udfsdk/ssq.h +++ b/utils/udfsdk/ssq.h @@ -50,8 +50,7 @@ * is also used to describe the interface that is used for * either. */ -#ifndef HEADER_ssq -#define HEADER_ssq +#pragma once #include #include @@ -230,5 +229,4 @@ protected: #undef EXPORT -#endif // HEADER_ssq.h diff --git a/utils/windowfunction/framebound.h b/utils/windowfunction/framebound.h index e6fbea4c2..7c5bf3575 100644 --- a/utils/windowfunction/framebound.h +++ b/utils/windowfunction/framebound.h @@ -18,8 +18,7 @@ // $Id: framebound.h 3932 2013-06-25 16:08:10Z xlou $ -#ifndef UTILS_FRAMEBOUND_H -#define UTILS_FRAMEBOUND_H +#pragma once #include @@ -153,6 +152,5 @@ extern std::map colType2String; } // namespace -#endif // UTILS_FRAMEBOUND_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/frameboundrange.h b/utils/windowfunction/frameboundrange.h index 3bfe04762..d3de02fcc 100644 --- a/utils/windowfunction/frameboundrange.h +++ b/utils/windowfunction/frameboundrange.h @@ -18,8 +18,7 @@ // $Id: frameboundrange.h 3868 2013-06-06 22:13:05Z xlou $ -#ifndef UTILS_FRAMEBOUNDRANGE_H -#define UTILS_FRAMEBOUNDRANGE_H +#pragma once #include "framebound.h" @@ -229,6 +228,5 @@ protected: } // namespace -#endif // UTILS_FRAMEBOUNDRANGE_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/frameboundrow.h b/utils/windowfunction/frameboundrow.h index 30aebf947..5f56847c1 100644 --- a/utils/windowfunction/frameboundrow.h +++ b/utils/windowfunction/frameboundrow.h @@ -18,8 +18,7 @@ // $Id: frameboundrow.h 3868 2013-06-06 22:13:05Z xlou $ -#ifndef UTILS_FRAMEBOUNDROW_H -#define UTILS_FRAMEBOUNDROW_H +#pragma once #include "framebound.h" @@ -165,6 +164,5 @@ protected: } // namespace -#endif // UTILS_FRAMEBOUNDROW_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/idborderby.h b/utils/windowfunction/idborderby.h index 30f49c1de..ca16ec22a 100644 --- a/utils/windowfunction/idborderby.h +++ b/utils/windowfunction/idborderby.h @@ -21,8 +21,7 @@ /** @file */ -#ifndef IDB_ORDER_BY_H -#define IDB_ORDER_BY_H +#pragma once #include #include @@ -435,5 +434,4 @@ protected: } -#endif // IDB_ORDER_BY_H diff --git a/utils/windowfunction/wf_count.h b/utils/windowfunction/wf_count.h index 934489815..883f04f92 100644 --- a/utils/windowfunction/wf_count.h +++ b/utils/windowfunction/wf_count.h @@ -18,8 +18,7 @@ // $Id: wf_count.h 3868 2013-06-06 22:13:05Z xlou $ -#ifndef UTILS_WF_COUNT_H -#define UTILS_WF_COUNT_H +#pragma once #include #include "windowfunctiontype.h" @@ -54,7 +53,6 @@ protected: } // namespace -#endif // UTILS_WF_COUNT_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/wf_lead_lag.h b/utils/windowfunction/wf_lead_lag.h index 81b707ae2..e9f8cb42d 100644 --- a/utils/windowfunction/wf_lead_lag.h +++ b/utils/windowfunction/wf_lead_lag.h @@ -18,8 +18,7 @@ // $Id: wf_lead_lag.h 3868 2013-06-06 22:13:05Z xlou $ -#ifndef UTILS_WF_LEAD_LAG_H -#define UTILS_WF_LEAD_LAG_H +#pragma once #include "windowfunctiontype.h" @@ -59,7 +58,6 @@ protected: } // namespace -#endif // UTILS_WF_LEAD_LAG_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/wf_min_max.h b/utils/windowfunction/wf_min_max.h index ebe12df65..3baeba5a2 100644 --- a/utils/windowfunction/wf_min_max.h +++ b/utils/windowfunction/wf_min_max.h @@ -18,8 +18,7 @@ // $Id: wf_min_max.h 3868 2013-06-06 22:13:05Z xlou $ -#ifndef UTILS_WF_MIN_MAX_H -#define UTILS_WF_MIN_MAX_H +#pragma once #include "windowfunctiontype.h" @@ -52,7 +51,6 @@ protected: } // namespace -#endif // UTILS_WF_MIN_MAX_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/wf_nth_value.h b/utils/windowfunction/wf_nth_value.h index 8ea294b02..bcc45b48d 100644 --- a/utils/windowfunction/wf_nth_value.h +++ b/utils/windowfunction/wf_nth_value.h @@ -18,8 +18,7 @@ // $Id: wf_nth_value.h 3868 2013-06-06 22:13:05Z xlou $ -#ifndef UTILS_WF_NTH_VALUE_H -#define UTILS_WF_NTH_VALUE_H +#pragma once #include "windowfunctiontype.h" @@ -57,7 +56,6 @@ protected: } // namespace -#endif // UTILS_WF_NTH_VALUE_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/wf_ntile.h b/utils/windowfunction/wf_ntile.h index 45d5ba64a..5d77486e2 100644 --- a/utils/windowfunction/wf_ntile.h +++ b/utils/windowfunction/wf_ntile.h @@ -18,8 +18,7 @@ // $Id: wf_ntile.h 3868 2013-06-06 22:13:05Z xlou $ -#ifndef UTILS_WF_NTILE_H -#define UTILS_WF_NTILE_H +#pragma once #include #include "windowfunctiontype.h" @@ -54,7 +53,6 @@ protected: } // namespace -#endif // UTILS_WF_NTILE_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/wf_percentile.h b/utils/windowfunction/wf_percentile.h index ae2c8db50..9a011d4d7 100644 --- a/utils/windowfunction/wf_percentile.h +++ b/utils/windowfunction/wf_percentile.h @@ -18,8 +18,7 @@ // $Id: wf_percentile.h 3868 2013-06-06 22:13:05Z xlou $ -#ifndef UTILS_WF_PERCENTILE_H -#define UTILS_WF_PERCENTILE_H +#pragma once #include #include "windowfunctiontype.h" @@ -55,7 +54,6 @@ protected: } // namespace -#endif // UTILS_WF_PERCENTILE_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/wf_ranking.h b/utils/windowfunction/wf_ranking.h index ce95bd122..908057c82 100644 --- a/utils/windowfunction/wf_ranking.h +++ b/utils/windowfunction/wf_ranking.h @@ -18,8 +18,7 @@ // $Id: wf_ranking.h 3868 2013-06-06 22:13:05Z xlou $ -#ifndef UTILS_WF_RANKING_H -#define UTILS_WF_RANKING_H +#pragma once #include #include "windowfunctiontype.h" @@ -53,7 +52,6 @@ protected: } // namespace -#endif // UTILS_WF_RANKING_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/wf_row_number.h b/utils/windowfunction/wf_row_number.h index 4b6a61c08..2b152c3d3 100644 --- a/utils/windowfunction/wf_row_number.h +++ b/utils/windowfunction/wf_row_number.h @@ -18,8 +18,7 @@ // $Id: wf_row_number.h 3868 2013-06-06 22:13:05Z xlou $ -#ifndef UTILS_WF_ROW_NUMBER_H -#define UTILS_WF_ROW_NUMBER_H +#pragma once #include #include "windowfunctiontype.h" @@ -52,7 +51,6 @@ protected: } // namespace -#endif // UTILS_WF_ROW_NUMBER_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/wf_stats.h b/utils/windowfunction/wf_stats.h index 6bff926a6..868411e55 100644 --- a/utils/windowfunction/wf_stats.h +++ b/utils/windowfunction/wf_stats.h @@ -18,8 +18,7 @@ // $Id: wf_stats.h 3868 2013-06-06 22:13:05Z xlou $ -#ifndef UTILS_WF_STATS_H -#define UTILS_WF_STATS_H +#pragma once #include "windowfunctiontype.h" @@ -54,7 +53,6 @@ protected: } // namespace -#endif // UTILS_WF_STATS_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/wf_sum_avg.h b/utils/windowfunction/wf_sum_avg.h index 0e2a4ffe2..c7b88db7f 100644 --- a/utils/windowfunction/wf_sum_avg.h +++ b/utils/windowfunction/wf_sum_avg.h @@ -19,8 +19,7 @@ // $Id: wf_sum_avg.h 3868 2013-06-06 22:13:05Z xlou $ -#ifndef UTILS_WF_SUM_AVG_H -#define UTILS_WF_SUM_AVG_H +#pragma once #include #include "windowfunctiontype.h" @@ -64,7 +63,6 @@ protected: } // namespace -#endif // UTILS_WF_SUM_AVG_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/wf_udaf.h b/utils/windowfunction/wf_udaf.h index eca42588f..fa71a1d51 100644 --- a/utils/windowfunction/wf_udaf.h +++ b/utils/windowfunction/wf_udaf.h @@ -18,8 +18,7 @@ *************************************************************************************/ -#ifndef UTILS_WF_UDAF_H -#define UTILS_WF_UDAF_H +#pragma once #ifndef _MSC_VER #include @@ -113,7 +112,6 @@ public: } // namespace -#endif // UTILS_WF_UDAF_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/windowframe.h b/utils/windowfunction/windowframe.h index 55996a13f..c5422a815 100644 --- a/utils/windowfunction/windowframe.h +++ b/utils/windowfunction/windowframe.h @@ -18,8 +18,7 @@ // $Id: windowframe.h 3932 2013-06-25 16:08:10Z xlou $ -#ifndef UTILS_WINDOWFRAME_H -#define UTILS_WINDOWFRAME_H +#pragma once #include // std::pair, std::make_pair #include @@ -125,6 +124,5 @@ protected: } // namespace -#endif // UTILS_WINDOWFRAME_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/windowfunction.h b/utils/windowfunction/windowfunction.h index 684501b19..ad99875c5 100644 --- a/utils/windowfunction/windowfunction.h +++ b/utils/windowfunction/windowfunction.h @@ -18,8 +18,7 @@ // $Id: windowfunction.h 3932 2013-06-25 16:08:10Z xlou $ -#ifndef UTILS_WINDOWFUNCTION_H -#define UTILS_WINDOWFUNCTION_H +#pragma once #include #include @@ -122,6 +121,5 @@ protected: } // namespace -#endif // UTILS_WINDOWFUNCTION_H // vim:ts=4 sw=4: diff --git a/utils/windowfunction/windowfunctiontype.h b/utils/windowfunction/windowfunctiontype.h index dfda6e053..350bc89da 100644 --- a/utils/windowfunction/windowfunctiontype.h +++ b/utils/windowfunction/windowfunctiontype.h @@ -19,8 +19,7 @@ // $Id: windowfunctiontype.h 3932 2013-06-25 16:08:10Z xlou $ -#ifndef UTILS_WINDOWFUNCTIONTYPE_H -#define UTILS_WINDOWFUNCTIONTYPE_H +#pragma once #include #include @@ -302,7 +301,6 @@ extern std::map colType2String; } // namespace -#endif // UTILS_WINDOWFUNCTIONTYPE_H // vim:ts=4 sw=4: diff --git a/utils/winport/fixup.h b/utils/winport/fixup.h index 9bdc87171..1aef069e5 100644 --- a/utils/winport/fixup.h +++ b/utils/winport/fixup.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef BOOTSTRAP_FIXUP_H__ -#define BOOTSTRAP_FIXUP_H__ +#pragma once #include @@ -25,4 +24,3 @@ namespace bootstrap extern int fixupConfig(const std::string&, const std::string&); } -#endif diff --git a/utils/winport/glob.h b/utils/winport/glob.h index 1dc3b5253..2e6862dcb 100644 --- a/utils/winport/glob.h +++ b/utils/winport/glob.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef GLOB_H__ -#define GLOB_H__ +#pragma once #include @@ -60,4 +59,3 @@ extern void globfree(glob_t* pglob); #ifdef __cplusplus } #endif -#endif diff --git a/utils/winport/grepit.h b/utils/winport/grepit.h index c9ddc0367..b015572cb 100644 --- a/utils/winport/grepit.h +++ b/utils/winport/grepit.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef WINPORT_GREPIT_H__ -#define WINPORT_GREPIT_H__ +#pragma once #include #include @@ -26,4 +25,3 @@ namespace winport extern bool grepit(std::istream&, const std::string&); } -#endif diff --git a/utils/winport/idb_getopt.h b/utils/winport/idb_getopt.h index 111274243..02c1aa546 100644 --- a/utils/winport/idb_getopt.h +++ b/utils/winport/idb_getopt.h @@ -16,8 +16,7 @@ MA 02110-1301, USA. */ // $Id: idb_getopt.h 3495 2013-01-21 14:09:51Z rdempsey $ -#ifndef IDB_GETOPT_H_ -#define IDB_GETOPT_H_ +#pragma once /* Same as GNU interface. For communication from `getopt' to the caller. When `getopt' finds an option that takes an argument, @@ -50,4 +49,3 @@ extern int optopt; extern int getopt(int, char* const*, const char*); -#endif diff --git a/utils/winport/idbregistry.h b/utils/winport/idbregistry.h index f6d1e740a..8ab3e4799 100644 --- a/utils/winport/idbregistry.h +++ b/utils/winport/idbregistry.h @@ -15,11 +15,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef IDB_REGISTRY_UTILS_H__ -#define IDB_REGISTRY_UTILS_H__ +#pragma once #include const std::string IDBreadRegistry(const std::string& name, bool returnShortName = false); -#endif diff --git a/utils/winport/inttypes.h b/utils/winport/inttypes.h index 89f3e12eb..a3f6e8ebd 100644 --- a/utils/winport/inttypes.h +++ b/utils/winport/inttypes.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef INTTYPES_H -#define INTTYPES_H 1 +#pragma once typedef int key_t; typedef int pid_t; @@ -28,4 +27,3 @@ typedef __int64 ssize_t; typedef unsigned int uint32_t; #endif -#endif diff --git a/utils/winport/poll.h b/utils/winport/poll.h index 58b1993c9..4d68a74ca 100644 --- a/utils/winport/poll.h +++ b/utils/winport/poll.h @@ -66,8 +66,7 @@ original. \*---------------------------------------------------------------------------*/ -#ifndef _POLL_EMUL_H_ -#define _POLL_EMUL_H_ +#pragma once #define POLLIN 0x01 #define POLLPRI 0x02 @@ -100,4 +99,3 @@ extern int poll(); } #endif -#endif /* _POLL_EMUL_H_ */ diff --git a/utils/winport/sedit.h b/utils/winport/sedit.h index dce78df92..fdbeef999 100644 --- a/utils/winport/sedit.h +++ b/utils/winport/sedit.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef WINPORT_SEDIT_H__ -#define WINPORT_SEDIT_H__ +#pragma once #include @@ -26,4 +25,3 @@ extern bool sedit(std::string& line, const std::string& find, const std::string& extern const string sedit2(const std::string& line, const std::string& find, const std::string& replace); } -#endif diff --git a/utils/winport/sysinfo.h b/utils/winport/sysinfo.h index 54a2d79fc..598502779 100644 --- a/utils/winport/sysinfo.h +++ b/utils/winport/sysinfo.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef IDB_SYSINFO_H_ -#define IDB_SYSINFO_H_ +#pragma once // System info stuff struct sysinfo @@ -37,4 +36,3 @@ struct sysinfo }; extern int sysinfo(sysinfo*); -#endif // IDB_SYSINFO_H_ diff --git a/utils/winport/syslog.h b/utils/winport/syslog.h index bc13c2a3f..6db304fe5 100644 --- a/utils/winport/syslog.h +++ b/utils/winport/syslog.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef WINPORT_SYSLOG_H__ -#define WINPORT_SYSLOG_H__ +#pragma once /* From sys/syslog.h */ @@ -58,5 +57,4 @@ #define LOG_LOCAL6 (22<<3) /* reserved for local use */ #define LOG_LOCAL7 (23<<3) /* reserved for local use */ -#endif diff --git a/utils/winport/unistd.h b/utils/winport/unistd.h index 6d363e23f..1c18f7a74 100644 --- a/utils/winport/unistd.h +++ b/utils/winport/unistd.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _UNISTD_H -#define _UNISTD_H 1 +#pragma once #include #include #define WIN32_LEAN_AND_MEAN @@ -150,5 +149,4 @@ extern std::string IDBSysErrorStr(DWORD err); #endif -#endif diff --git a/utils/winport/winport.h b/utils/winport/winport.h index 6ea2f0e68..96c079ad9 100644 --- a/utils/winport/winport.h +++ b/utils/winport/winport.h @@ -15,11 +15,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef WINPORT_H -#define WINPORT_H 1 +#pragma once #ifdef _MSC_VER typedef unsigned int uint; #endif -#endif diff --git a/versioning/BRM/autoincrementmanager.h b/versioning/BRM/autoincrementmanager.h index 133d99d51..b7dd3d0bf 100644 --- a/versioning/BRM/autoincrementmanager.h +++ b/versioning/BRM/autoincrementmanager.h @@ -27,8 +27,7 @@ #include #include "calpontsystemcatalog.h" -#ifndef AUTOINCREMENTMANAGER_H_ -#define AUTOINCREMENTMANAGER_H_ +#pragma once #if defined(_MSC_VER) && defined(xxxBRMAUTOINCMGR_DLLEXPORT) #define EXPORT __declspec(dllexport) @@ -78,4 +77,3 @@ private: #undef EXPORT -#endif /* AUTOINCREMENTMANAGER_H_ */ diff --git a/versioning/BRM/blockresolutionmanager.h b/versioning/BRM/blockresolutionmanager.h index b140f1b95..cde2faaa3 100644 --- a/versioning/BRM/blockresolutionmanager.h +++ b/versioning/BRM/blockresolutionmanager.h @@ -24,8 +24,7 @@ * class BlockResolutionManager */ -#ifndef BLOCKRESOLUTIONMANAGER_H_ -#define BLOCKRESOLUTIONMANAGER_H_ +#pragma once #include #include @@ -127,4 +126,3 @@ private: #undef EXPORT -#endif diff --git a/versioning/BRM/brmshmimpl.h b/versioning/BRM/brmshmimpl.h index 5fd66c116..e7345844e 100644 --- a/versioning/BRM/brmshmimpl.h +++ b/versioning/BRM/brmshmimpl.h @@ -24,8 +24,7 @@ * class BRMShmImpl */ -#ifndef IDBSHMIMPL_H_ -#define IDBSHMIMPL_H_ +#pragma once #include //#define NDEBUG @@ -76,4 +75,3 @@ private: } //namespace -#endif diff --git a/versioning/BRM/brmtypes.h b/versioning/BRM/brmtypes.h index 93abec9b9..28301ce02 100644 --- a/versioning/BRM/brmtypes.h +++ b/versioning/BRM/brmtypes.h @@ -23,8 +23,7 @@ /** @file */ -#ifndef BRMTYPES_H_ -#define BRMTYPES_H_ +#pragma once #include #include @@ -659,4 +658,3 @@ std::ostream& operator<<(std::ostream&, const QueryContext&); #undef EXPORT -#endif diff --git a/versioning/BRM/copylocks.h b/versioning/BRM/copylocks.h index f8d60b7c5..d3a39f831 100644 --- a/versioning/BRM/copylocks.h +++ b/versioning/BRM/copylocks.h @@ -24,8 +24,7 @@ * class XXX interface */ -#ifndef COPYLOCKS_H_ -#define COPYLOCKS_H_ +#pragma once #include #include @@ -171,4 +170,3 @@ private: #undef EXPORT -#endif diff --git a/versioning/BRM/dbrm.h b/versioning/BRM/dbrm.h index e7ec67dce..78a707d1d 100644 --- a/versioning/BRM/dbrm.h +++ b/versioning/BRM/dbrm.h @@ -24,8 +24,7 @@ * class DBRM */ -#ifndef DBRM_H_ -#define DBRM_H_ +#pragma once #include #include @@ -1051,4 +1050,3 @@ private: #undef EXPORT -#endif diff --git a/versioning/BRM/extentmap.h b/versioning/BRM/extentmap.h index 29b97c0be..e95989d17 100644 --- a/versioning/BRM/extentmap.h +++ b/versioning/BRM/extentmap.h @@ -24,8 +24,7 @@ * class ExtentMap */ -#ifndef _EXTENTMAP_H_ -#define _EXTENTMAP_H_ +#pragma once #include #include @@ -1037,4 +1036,3 @@ inline std::ostream& operator<<(std::ostream& os, ExtentMap& rhs) #undef EXPORT -#endif diff --git a/versioning/BRM/lbidresourcegraph.h b/versioning/BRM/lbidresourcegraph.h index f2d92d417..cdedc70fe 100644 --- a/versioning/BRM/lbidresourcegraph.h +++ b/versioning/BRM/lbidresourcegraph.h @@ -24,8 +24,7 @@ * class XXX interface */ -#ifndef LBIDRESOURCEGRAPH_H_ -#define LBIDRESOURCEGRAPH_H_ +#pragma once #include #include @@ -85,4 +84,3 @@ private: #undef EXPORT -#endif diff --git a/versioning/BRM/logicalpartition.h b/versioning/BRM/logicalpartition.h index e2445f742..b82b39e9d 100644 --- a/versioning/BRM/logicalpartition.h +++ b/versioning/BRM/logicalpartition.h @@ -25,8 +25,7 @@ * This struct will be used in connector, brm and writeengine */ -#ifndef LOGICALPARTITION_H_ -#define LOGICALPARTITION_H_ +#pragma once #include "bytestream.h" @@ -87,4 +86,3 @@ messageqcpp::ByteStream& operator<<(messageqcpp::ByteStream& bs, const LogicalPa messageqcpp::ByteStream& operator>>(messageqcpp::ByteStream& bs, LogicalPartition& rhs); } -#endif diff --git a/versioning/BRM/masterdbrmnode.h b/versioning/BRM/masterdbrmnode.h index f5fbf2200..44c965f22 100644 --- a/versioning/BRM/masterdbrmnode.h +++ b/versioning/BRM/masterdbrmnode.h @@ -24,8 +24,7 @@ * class MasterDBRMNode interface */ -#ifndef MASTERDBRMNODE_H_ -#define MASTERDBRMNODE_H_ +#pragma once #include #include @@ -263,4 +262,3 @@ private: } -#endif diff --git a/versioning/BRM/mastersegmenttable.h b/versioning/BRM/mastersegmenttable.h index e71a1556d..1b7ac2bd6 100644 --- a/versioning/BRM/mastersegmenttable.h +++ b/versioning/BRM/mastersegmenttable.h @@ -31,8 +31,7 @@ * XXXPAT: We should make a cleanup class here also. */ -#ifndef _MASTERSEGMENTTABLE_H_ -#define _MASTERSEGMENTTABLE_H_ +#pragma once #include #include @@ -213,4 +212,3 @@ private: #undef EXPORT -#endif diff --git a/versioning/BRM/oidserver.h b/versioning/BRM/oidserver.h index d4e0762a5..6b32c4967 100644 --- a/versioning/BRM/oidserver.h +++ b/versioning/BRM/oidserver.h @@ -24,8 +24,7 @@ * class OIDServer interface. */ -#ifndef OBJECTIDMANAGER_H_ -#define OBJECTIDMANAGER_H_ +#pragma once #include #include @@ -212,4 +211,3 @@ private: #undef EXPORT -#endif diff --git a/versioning/BRM/resourcenode.h b/versioning/BRM/resourcenode.h index f8a91d176..d4b2f77c0 100644 --- a/versioning/BRM/resourcenode.h +++ b/versioning/BRM/resourcenode.h @@ -24,8 +24,7 @@ * class XXX interface */ -#ifndef RESOURCENODE_H_ -#define RESOURCENODE_H_ +#pragma once #include "rgnode.h" @@ -87,4 +86,3 @@ struct RNEquals #undef EXPORT -#endif diff --git a/versioning/BRM/rgnode.h b/versioning/BRM/rgnode.h index 97ca89230..b1f377991 100644 --- a/versioning/BRM/rgnode.h +++ b/versioning/BRM/rgnode.h @@ -24,8 +24,7 @@ * class RGNode interface. This is a base class for the nodes in the resource graph. */ -#ifndef RGNODE_H_ -#define RGNODE_H_ +#pragma once #include @@ -74,4 +73,3 @@ private: #undef EXPORT -#endif diff --git a/versioning/BRM/rwlockmonitor.h b/versioning/BRM/rwlockmonitor.h index 93e2a6c8a..7a7d0f52e 100644 --- a/versioning/BRM/rwlockmonitor.h +++ b/versioning/BRM/rwlockmonitor.h @@ -22,8 +22,7 @@ * Author: pleblanc */ -#ifndef RWLOCKMONITOR_H_ -#define RWLOCKMONITOR_H_ +#pragma once #include #include @@ -68,5 +67,4 @@ private: #undef EXPORT -#endif /* RWLOCKMONITOR_H_ */ diff --git a/versioning/BRM/sessionmanagerserver.h b/versioning/BRM/sessionmanagerserver.h index e1782e3e8..d2f007519 100644 --- a/versioning/BRM/sessionmanagerserver.h +++ b/versioning/BRM/sessionmanagerserver.h @@ -24,8 +24,7 @@ * class SessionManagerServer interface */ -#ifndef _SESSIONMANAGERSERVER_H -#define _SESSIONMANAGERSERVER_H +#pragma once #include @@ -293,4 +292,3 @@ private: #undef EXPORT -#endif diff --git a/versioning/BRM/shmkeys.h b/versioning/BRM/shmkeys.h index 62dd67866..d3aa991b7 100644 --- a/versioning/BRM/shmkeys.h +++ b/versioning/BRM/shmkeys.h @@ -17,8 +17,7 @@ // $Id: shmkeys.h 1823 2013-01-21 14:13:09Z rdempsey $ /** @file */ -#ifndef BRM_SHMEYS_H_ -#define BRM_SHMEYS_H_ +#pragma once #include #include @@ -77,5 +76,4 @@ private: #undef EXPORT -#endif diff --git a/versioning/BRM/slavecomm.h b/versioning/BRM/slavecomm.h index a7b7b44f3..cc53dfb56 100644 --- a/versioning/BRM/slavecomm.h +++ b/versioning/BRM/slavecomm.h @@ -24,8 +24,7 @@ * class XXX interface */ -#ifndef SLAVECOMM_H_ -#define SLAVECOMM_H_ +#pragma once #include #include @@ -142,4 +141,3 @@ private: #undef EXPORT -#endif diff --git a/versioning/BRM/slavedbrmnode.h b/versioning/BRM/slavedbrmnode.h index 482df198f..ecb103473 100644 --- a/versioning/BRM/slavedbrmnode.h +++ b/versioning/BRM/slavedbrmnode.h @@ -24,8 +24,7 @@ * class SlaveDBRMNode */ -#ifndef SLAVEDBRMNODE_H_ -#define SLAVEDBRMNODE_H_ +#pragma once #include #include @@ -519,4 +518,3 @@ private: #undef EXPORT -#endif diff --git a/versioning/BRM/tablelockserver.h b/versioning/BRM/tablelockserver.h index dc10771b2..c2c7e4369 100644 --- a/versioning/BRM/tablelockserver.h +++ b/versioning/BRM/tablelockserver.h @@ -25,8 +25,7 @@ #include "brmtypes.h" #include "sessionmanagerserver.h" -#ifndef TABLELOCKSERVER_H_ -#define TABLELOCKSERVER_H_ +#pragma once #if defined(_MSC_VER) && defined(xxxBRMTBLLOCKSVR_DLLEXPORT) #define EXPORT __declspec(dllexport) @@ -68,4 +67,3 @@ private: #undef EXPORT -#endif /* TABLELOCKSERVER_H_ */ diff --git a/versioning/BRM/tracer.h b/versioning/BRM/tracer.h index 3f40e33b9..31e4bc015 100644 --- a/versioning/BRM/tracer.h +++ b/versioning/BRM/tracer.h @@ -24,8 +24,7 @@ * class DBRM */ -#ifndef TRACER_H_ -#define TRACER_H_ +#pragma once #include #include @@ -190,5 +189,4 @@ private: #undef EXPORT -#endif diff --git a/versioning/BRM/transactionnode.h b/versioning/BRM/transactionnode.h index 8c12caab6..dd7003bce 100644 --- a/versioning/BRM/transactionnode.h +++ b/versioning/BRM/transactionnode.h @@ -24,8 +24,7 @@ * class XXX interface */ -#ifndef TRANSACTIONNODE_H_ -#define TRANSACTIONNODE_H_ +#pragma once #include #include @@ -70,4 +69,3 @@ private: } // namespace -#endif // TRANSACTIONNODE_H_ diff --git a/versioning/BRM/undoable.h b/versioning/BRM/undoable.h index 2008aa543..8f3e918fc 100644 --- a/versioning/BRM/undoable.h +++ b/versioning/BRM/undoable.h @@ -25,8 +25,7 @@ * to support revoking any changes made on error. */ -#ifndef _UNDOABLE_H_ -#define _UNDOABLE_H_ +#pragma once #include @@ -59,4 +58,3 @@ protected: } -#endif diff --git a/versioning/BRM/vbbm.h b/versioning/BRM/vbbm.h index b2e430d3e..4df6616c5 100644 --- a/versioning/BRM/vbbm.h +++ b/versioning/BRM/vbbm.h @@ -24,8 +24,7 @@ * class XXX interface */ -#ifndef _VBBM_H_ -#define _VBBM_H_ +#pragma once #include //#define NDEBUG @@ -260,5 +259,4 @@ private: #undef EXPORT -#endif // _VBBM_H_ diff --git a/versioning/BRM/vss.h b/versioning/BRM/vss.h index 9595b0d26..25ae7e1aa 100644 --- a/versioning/BRM/vss.h +++ b/versioning/BRM/vss.h @@ -24,8 +24,7 @@ * class XXX interface */ -#ifndef _VSS_H_ -#define _VSS_H_ +#pragma once #include //#define NDEBUG @@ -298,5 +297,4 @@ private: #undef EXPORT -#endif // _VSS_H_ diff --git a/writeengine/bulk/we_brmreporter.h b/writeengine/bulk/we_brmreporter.h index e71310ff1..f1b0a0a6a 100644 --- a/writeengine/bulk/we_brmreporter.h +++ b/writeengine/bulk/we_brmreporter.h @@ -32,8 +32,7 @@ * class BRMReporter */ -#ifndef _WE_BRMREPORTER_H_ -#define _WE_BRMREPORTER_H_ +#pragma once namespace WriteEngine { @@ -144,4 +143,3 @@ private: } // end of namespace -#endif // _WE_BRMREPORTER_H_ diff --git a/writeengine/bulk/we_bulkload.h b/writeengine/bulk/we_bulkload.h index 168dbda99..dd4033acd 100644 --- a/writeengine/bulk/we_bulkload.h +++ b/writeengine/bulk/we_bulkload.h @@ -21,8 +21,7 @@ *******************************************************************************/ /** @file */ -#ifndef _WE_BULKLOAD_H_ -#define _WE_BULKLOAD_H_ +#pragma once #ifndef _MSC_VER #include #endif @@ -574,4 +573,3 @@ inline bool BulkLoad::disableTimeOut() const #undef EXPORT -#endif // _WE_BULKLOAD_H_ diff --git a/writeengine/bulk/we_bulkloadbuffer.h b/writeengine/bulk/we_bulkloadbuffer.h index e953c1b82..b52df7b95 100644 --- a/writeengine/bulk/we_bulkloadbuffer.h +++ b/writeengine/bulk/we_bulkloadbuffer.h @@ -19,8 +19,7 @@ * $Id: we_bulkloadbuffer.h 4489 2013-01-30 18:47:53Z dcathey $ * ********************************************************************/ -#ifndef _WE_BULKLOADBUFFER_H -#define _WE_BULKLOADBUFFER_H +#pragma once #include "we_type.h" #include "limits" @@ -422,4 +421,3 @@ inline bool isTrueWord(const char *field, int fieldLength) } } -#endif diff --git a/writeengine/bulk/we_bulkstatus.h b/writeengine/bulk/we_bulkstatus.h index 320c7291c..f6496cb91 100644 --- a/writeengine/bulk/we_bulkstatus.h +++ b/writeengine/bulk/we_bulkstatus.h @@ -21,8 +21,7 @@ *******************************************************************************/ /** @file */ -#ifndef _WE_BULKSTATUS_H_ -#define _WE_BULKSTATUS_H_ +#pragma once #if 0 //defined(_MSC_VER) && defined(WE_BULKSTATUS_DLLEXPORT) #define EXPORT __declspec(dllexport) @@ -62,4 +61,3 @@ private: #undef EXPORT -#endif // _WE_BULKSTATUS_H_ diff --git a/writeengine/bulk/we_colbuf.h b/writeengine/bulk/we_colbuf.h index 72efa1cee..b237d788d 100644 --- a/writeengine/bulk/we_colbuf.h +++ b/writeengine/bulk/we_colbuf.h @@ -24,8 +24,7 @@ * class ColumnBuffer */ -#ifndef WRITEENGINE_COLUMNBUF_H -#define WRITEENGINE_COLUMNBUF_H +#pragma once #include @@ -130,4 +129,3 @@ protected: } -#endif //WRITEENGINE_COLUMNBUF_H diff --git a/writeengine/bulk/we_colbufcompressed.h b/writeengine/bulk/we_colbufcompressed.h index 3eba2c9b1..2d9e961e9 100644 --- a/writeengine/bulk/we_colbufcompressed.h +++ b/writeengine/bulk/we_colbufcompressed.h @@ -24,8 +24,7 @@ * class ColumnBufferCompressed */ -#ifndef WRITEENGINE_COLUMNBUFCOMPRESSED_H -#define WRITEENGINE_COLUMNBUFCOMPRESSED_H +#pragma once #include "we_colbuf.h" @@ -118,4 +117,3 @@ private: } -#endif //WRITEENGINE_COLUMNBUFCOMPRESSED_H diff --git a/writeengine/bulk/we_colbufmgr.h b/writeengine/bulk/we_colbufmgr.h index eb0a51370..1c276e86b 100644 --- a/writeengine/bulk/we_colbufmgr.h +++ b/writeengine/bulk/we_colbufmgr.h @@ -24,8 +24,7 @@ * class ColumnBufferManager */ -#ifndef WRITEENGINE_COLBUFMGR_H -#define WRITEENGINE_COLBUFMGR_H +#pragma once #include #include @@ -277,4 +276,3 @@ public: }; } -#endif /*WRITEENGINE_COLBUFMGR_H*/ diff --git a/writeengine/bulk/we_colbufsec.h b/writeengine/bulk/we_colbufsec.h index b68becd2c..5ee80a50e 100644 --- a/writeengine/bulk/we_colbufsec.h +++ b/writeengine/bulk/we_colbufsec.h @@ -24,8 +24,7 @@ /** @file * class ColumnBufferSection */ -#ifndef WRITEENGINE_COLBUFSEC_H -#define WRITEENGINE_COLBUFSEC_H +#pragma once #include "we_type.h" #include "we_colbuf.h" @@ -116,5 +115,4 @@ private: } -#endif /*WRITEENGINE_COLBUFSEC_H*/ diff --git a/writeengine/bulk/we_colextinf.h b/writeengine/bulk/we_colextinf.h index 60930d8ed..4c71da2ca 100644 --- a/writeengine/bulk/we_colextinf.h +++ b/writeengine/bulk/we_colextinf.h @@ -25,8 +25,7 @@ * For ex: this is where we track the min/max values per extent for a column. */ -#ifndef WE_COLEXTINF_H_ -#define WE_COLEXTINF_H_ +#pragma once #include #include @@ -273,4 +272,3 @@ private: } //end of namespace -#endif // WE_COLEXTINF_H_ diff --git a/writeengine/bulk/we_colopbulk.h b/writeengine/bulk/we_colopbulk.h index 53d7b770f..4a560761a 100644 --- a/writeengine/bulk/we_colopbulk.h +++ b/writeengine/bulk/we_colopbulk.h @@ -24,8 +24,7 @@ * class ColumnOpBulk */ -#ifndef _WE_COLOP_BULK_H_ -#define _WE_COLOP_BULK_H_ +#pragma once #include "we_colop.h" @@ -59,4 +58,3 @@ public: } //end of namespace -#endif // _WE_COLOP_BULK_H_ diff --git a/writeengine/bulk/we_columnautoinc.h b/writeengine/bulk/we_columnautoinc.h index f3d93c557..2a9bb0cfb 100644 --- a/writeengine/bulk/we_columnautoinc.h +++ b/writeengine/bulk/we_columnautoinc.h @@ -23,8 +23,7 @@ * Contains classes to manage the "next value" for an auto-increment column. */ -#ifndef WE_COLUMNAUTOINC_H_ -#define WE_COLUMNAUTOINC_H_ +#pragma once #include #include @@ -127,4 +126,3 @@ public: } //end of namespace -#endif // WE_COLUMNAUTOINC_H_ diff --git a/writeengine/bulk/we_columninfo.h b/writeengine/bulk/we_columninfo.h index dbae719b5..f918e9603 100644 --- a/writeengine/bulk/we_columninfo.h +++ b/writeengine/bulk/we_columninfo.h @@ -24,8 +24,7 @@ * Contains main class used to manage column information. */ -#ifndef _WE_COLUMNINFO_H -#define _WE_COLUMNINFO_H +#pragma once #include "we_type.h" #include "we_brm.h" @@ -591,4 +590,3 @@ inline void ColumnInfo::updateCPInfo( } // end of namespace -#endif diff --git a/writeengine/bulk/we_columninfocompressed.h b/writeengine/bulk/we_columninfocompressed.h index 7f8ea039c..17828db87 100644 --- a/writeengine/bulk/we_columninfocompressed.h +++ b/writeengine/bulk/we_columninfocompressed.h @@ -24,8 +24,7 @@ * Contains main class used to manage compressed column information. */ -#ifndef _WE_COLUMNINFOCOMPRESSED_H -#define _WE_COLUMNINFOCOMPRESSED_H +#pragma once #include "we_columninfo.h" #include "we_fileop.h" @@ -98,4 +97,3 @@ private: } -#endif diff --git a/writeengine/bulk/we_extentstripealloc.h b/writeengine/bulk/we_extentstripealloc.h index 1709c4c2b..8c0acf618 100644 --- a/writeengine/bulk/we_extentstripealloc.h +++ b/writeengine/bulk/we_extentstripealloc.h @@ -24,8 +24,7 @@ * Contains class to allocate a "stripe" of extents for all columns across a tbl */ -#ifndef WE_EXTENTSTRIPEALLOC_H_ -#define WE_EXTENTSTRIPEALLOC_H_ +#pragma once #include #include @@ -181,4 +180,3 @@ private: } //end of namespace -#endif // WE_EXTENTSTRIPEALLOC_H_ diff --git a/writeengine/bulk/we_tableinfo.h b/writeengine/bulk/we_tableinfo.h index 93e03b41c..2820d0379 100644 --- a/writeengine/bulk/we_tableinfo.h +++ b/writeengine/bulk/we_tableinfo.h @@ -19,8 +19,7 @@ * $Id: we_tableinfo.h 4648 2013-05-29 21:42:40Z rdempsey $ * *******************************************************************************/ -#ifndef _WE_TABLEINFO_H -#define _WE_TABLEINFO_H +#pragma once #include #include @@ -685,4 +684,3 @@ inline void TableInfo::setErrorDir( const std::string& errorDir ) } #endif } -#endif diff --git a/writeengine/bulk/we_tempxmlgendata.h b/writeengine/bulk/we_tempxmlgendata.h index 59c812a2b..980903315 100644 --- a/writeengine/bulk/we_tempxmlgendata.h +++ b/writeengine/bulk/we_tempxmlgendata.h @@ -21,8 +21,7 @@ *******************************************************************************/ /** @file */ -#ifndef _WE_TEMPXMLGENDATA_H_ -#define _WE_TEMPXMLGENDATA_H_ +#pragma once #include #include @@ -53,4 +52,3 @@ private: } // end of WriteEngine namespace -#endif // _WE_TEMPXMLGENDATA_H_ diff --git a/writeengine/client/we_clients.h b/writeengine/client/we_clients.h index e7f3b05e2..72feb427e 100644 --- a/writeengine/client/we_clients.h +++ b/writeengine/client/we_clients.h @@ -19,8 +19,7 @@ // /** @file */ -#ifndef WECLIENTS_H__ -#define WECLIENTS_H__ +#pragma once #include #include @@ -172,5 +171,4 @@ public: #undef EXPORT -#endif // vim:ts=4 sw=4: diff --git a/writeengine/client/we_ddlcommandclient.h b/writeengine/client/we_ddlcommandclient.h index e7bcf06e1..1e96b4a3f 100644 --- a/writeengine/client/we_ddlcommandclient.h +++ b/writeengine/client/we_ddlcommandclient.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef WE_DDLCOMMANDCLIENT_H__ -#define WE_DDLCOMMANDCLIENT_H__ +#pragma once #include @@ -63,4 +62,3 @@ private: #undef EXPORT -#endif diff --git a/writeengine/client/we_dmlcommandclient.h b/writeengine/client/we_dmlcommandclient.h index 14382bf93..482ffa9f3 100644 --- a/writeengine/client/we_dmlcommandclient.h +++ b/writeengine/client/we_dmlcommandclient.h @@ -15,8 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef WE_DMLCOMMANDCLIENT_H__ -#define WE_DMLCOMMANDCLIENT_H__ +#pragma once #include @@ -55,4 +54,3 @@ private: #undef EXPORT -#endif diff --git a/writeengine/dictionary/we_dctnry.h b/writeengine/dictionary/we_dctnry.h index fd9d1bf3a..4fb55697d 100644 --- a/writeengine/dictionary/we_dctnry.h +++ b/writeengine/dictionary/we_dctnry.h @@ -24,8 +24,7 @@ * can be deleted */ -#ifndef _WE_DCTNRY_H_ -#define _WE_DCTNRY_H_ +#pragma once #include #include @@ -349,4 +348,3 @@ protected: #undef EXPORT -#endif // _WE_DCTNRY_H_ diff --git a/writeengine/dictionary/we_dctnrystore.h b/writeengine/dictionary/we_dctnrystore.h index 1c19306b5..9669aa682 100644 --- a/writeengine/dictionary/we_dctnrystore.h +++ b/writeengine/dictionary/we_dctnrystore.h @@ -33,8 +33,7 @@ * delete tokens. But this function is not currently used. */ -#ifndef _WE_DctnryStore_H_ -#define _WE_DctnryStore_H_ +#pragma once #include @@ -227,4 +226,3 @@ private: #undef EXPORT -#endif // _WE_DctnryStore_H_ diff --git a/writeengine/index/we_freemgr.h b/writeengine/index/we_freemgr.h index 407085e62..d2caa6c69 100644 --- a/writeengine/index/we_freemgr.h +++ b/writeengine/index/we_freemgr.h @@ -21,8 +21,7 @@ ******************************************************************************************/ /** @file */ -#ifndef _WE_FREEMGR_H_ -#define _WE_FREEMGR_H_ +#pragma once #include @@ -121,4 +120,3 @@ public: }; } //end of namespace -#endif // _WE_FREEMGR_H_ diff --git a/writeengine/index/we_indexlist.h b/writeengine/index/we_indexlist.h index c558f164b..1adab388a 100644 --- a/writeengine/index/we_indexlist.h +++ b/writeengine/index/we_indexlist.h @@ -21,8 +21,7 @@ ******************************************************************************************/ /** @file */ -#ifndef _WE_IndexList_H_ -#define _WE_IndexList_H_ +#pragma once #include #include @@ -484,4 +483,3 @@ private: }; //std::ostream& operator<<(std::ostream& os, const IndexList& rhs); } //end of namespace -#endif // _WE_IndexList_H_ diff --git a/writeengine/index/we_indextree.h b/writeengine/index/we_indextree.h index 4a454a368..2c5f8e362 100644 --- a/writeengine/index/we_indextree.h +++ b/writeengine/index/we_indextree.h @@ -21,8 +21,7 @@ ******************************************************************************************/ /** @file */ -#ifndef _WE_INDEXTREE_H_ -#define _WE_INDEXTREE_H_ +#pragma once #include @@ -331,4 +330,3 @@ private: #undef EXPORT -#endif // _WE_INDEXTREE_H_ diff --git a/writeengine/redistribute/we_redistribute.h b/writeengine/redistribute/we_redistribute.h index f3b08fb9f..9ae9f3ff0 100644 --- a/writeengine/redistribute/we_redistribute.h +++ b/writeengine/redistribute/we_redistribute.h @@ -19,8 +19,7 @@ * $Id: we_redistribute.h 4450 2013-01-21 14:13:24Z rdempsey $ */ -#ifndef WE_REDISTRIBUTE_H -#define WE_REDISTRIBUTE_H +#pragma once // forward reference @@ -48,7 +47,6 @@ private: } // namespace -#endif // WE_REDISTRIBUTE_H // vim:ts=4 sw=4: diff --git a/writeengine/redistribute/we_redistributecontrol.h b/writeengine/redistribute/we_redistributecontrol.h index c5f492347..9e34540bb 100644 --- a/writeengine/redistribute/we_redistributecontrol.h +++ b/writeengine/redistribute/we_redistributecontrol.h @@ -19,8 +19,7 @@ * $Id: we_redistributecontrol.h 4450 2013-01-21 14:13:24Z rdempsey $ */ -#ifndef WE_REDISTRIBUTECONTROL_H -#define WE_REDISTRIBUTECONTROL_H +#pragma once #include #include @@ -129,7 +128,6 @@ private: } // namespace -#endif // WE_REDISTRIBUTECONTROL_H // vim:ts=4 sw=4: diff --git a/writeengine/redistribute/we_redistributecontrolthread.h b/writeengine/redistribute/we_redistributecontrolthread.h index 9b28fe9d7..c4727079a 100644 --- a/writeengine/redistribute/we_redistributecontrolthread.h +++ b/writeengine/redistribute/we_redistributecontrolthread.h @@ -19,8 +19,7 @@ * $Id: we_redistributecontrolthread.h 4450 2013-01-21 14:13:24Z rdempsey $ */ -#ifndef WE_REDISTRIBUTECONTROLTHREAD_H -#define WE_REDISTRIBUTECONTROLTHREAD_H +#pragma once #include #include @@ -129,7 +128,6 @@ private: } // namespace -#endif // WE_REDISTRIBUTECONTROLTHREAD_H // vim:ts=4 sw=4: diff --git a/writeengine/redistribute/we_redistributedef.h b/writeengine/redistribute/we_redistributedef.h index cfc98ec91..424400735 100644 --- a/writeengine/redistribute/we_redistributedef.h +++ b/writeengine/redistribute/we_redistributedef.h @@ -19,8 +19,7 @@ * $Id: we_redistributedef.h 4450 2013-01-21 14:13:24Z rdempsey $ */ -#ifndef WE_REDISTRIBUTEDEF_H -#define WE_REDISTRIBUTEDEF_H +#pragma once #include #include @@ -207,7 +206,6 @@ struct RedistributeInfo } // namespace -#endif // WE_REDISTRIBUTEDEF_H // vim:ts=4 sw=4: diff --git a/writeengine/redistribute/we_redistributeworkerthread.h b/writeengine/redistribute/we_redistributeworkerthread.h index 96536dcfc..ec2b8307c 100644 --- a/writeengine/redistribute/we_redistributeworkerthread.h +++ b/writeengine/redistribute/we_redistributeworkerthread.h @@ -19,8 +19,7 @@ * $Id: we_redistributeworkerthread.h 4450 2013-01-21 14:13:24Z rdempsey $ */ -#ifndef WE_REDISTRIBUTEWORKERTHREAD_H -#define WE_REDISTRIBUTEWORKERTHREAD_H +#pragma once #include #include @@ -153,7 +152,6 @@ private: } // namespace -#endif // WE_REDISTRIBUTEWORKERTHREAD_H // vim:ts=4 sw=4: diff --git a/writeengine/server/we_brmrprtparser.h b/writeengine/server/we_brmrprtparser.h index 9b179f070..c0e367081 100644 --- a/writeengine/server/we_brmrprtparser.h +++ b/writeengine/server/we_brmrprtparser.h @@ -26,8 +26,7 @@ * Author: bpaul */ -#ifndef WE_BRMRPRTPARSER_H_ -#define WE_BRMRPRTPARSER_H_ +#pragma once #include #include @@ -71,4 +70,3 @@ private: }; } /* namespace WriteEngine */ -#endif /* WE_BRMRPRTPARSER_H_ */ diff --git a/writeengine/server/we_cleartablelockcmd.h b/writeengine/server/we_cleartablelockcmd.h index 362ece153..cb962deb2 100644 --- a/writeengine/server/we_cleartablelockcmd.h +++ b/writeengine/server/we_cleartablelockcmd.h @@ -19,8 +19,7 @@ * $Id: we_cleartablelockcmd.h 4450 2013-01-21 14:13:24Z rdempsey $ * *******************************************************************************/ -#ifndef WE_CLEARTABLELOCKCMD_H__ -#define WE_CLEARTABLELOCKCMD_H__ +#pragma once #include @@ -61,4 +60,3 @@ private: } -#endif diff --git a/writeengine/server/we_cpifeederthread.h b/writeengine/server/we_cpifeederthread.h index b0851c172..ba8a51a4d 100644 --- a/writeengine/server/we_cpifeederthread.h +++ b/writeengine/server/we_cpifeederthread.h @@ -27,8 +27,7 @@ * Author: bpaul */ -#ifndef WE_CPIFEEDERTHREAD_H_ -#define WE_CPIFEEDERTHREAD_H_ +#pragma once #include @@ -93,4 +92,3 @@ private: } /* namespace WriteEngine */ -#endif /* WE_CPIFEEDERTHREAD_H_ */ diff --git a/writeengine/server/we_dataloader.h b/writeengine/server/we_dataloader.h index 6a1117528..c9fbf8703 100644 --- a/writeengine/server/we_dataloader.h +++ b/writeengine/server/we_dataloader.h @@ -30,8 +30,7 @@ -#ifndef WE_DATALOADER_H_ -#define WE_DATALOADER_H_ +#pragma once #include "rwlock_local.h" #include "resourcemanager.h" @@ -218,4 +217,3 @@ public: } -#endif /* WE_DATALOADER_H_ */ diff --git a/writeengine/server/we_ddlcommandproc.h b/writeengine/server/we_ddlcommandproc.h index 786fbcafa..ab782b537 100644 --- a/writeengine/server/we_ddlcommandproc.h +++ b/writeengine/server/we_ddlcommandproc.h @@ -19,8 +19,7 @@ * $Id: we_ddlcommandproc.h 3043 2011-08-29 22:03:03Z chao $ * *******************************************************************************/ -#ifndef WE_DDLCOMMANDPROC_H__ -#define WE_DDLCOMMANDPROC_H__ +#pragma once #include #include "bytestream.h" @@ -116,4 +115,3 @@ private: }; } #undef EXPORT -#endif diff --git a/writeengine/server/we_ddlcommon.h b/writeengine/server/we_ddlcommon.h index 24f611b70..a53bcd58c 100644 --- a/writeengine/server/we_ddlcommon.h +++ b/writeengine/server/we_ddlcommon.h @@ -21,8 +21,7 @@ *******************************************************************************/ -#ifndef WE_DDLCOMMON_H -#define WE_DDLCOMMON_H +#pragma once #include #include @@ -330,5 +329,4 @@ inline void convertRidToColumn(uint64_t& rid, unsigned& dbRoot, unsigned& partit } #undef EXPORT -#endif diff --git a/writeengine/server/we_dmlcommandproc.h b/writeengine/server/we_dmlcommandproc.h index 4265aa59c..825057998 100644 --- a/writeengine/server/we_dmlcommandproc.h +++ b/writeengine/server/we_dmlcommandproc.h @@ -19,8 +19,7 @@ * $Id: we_ddlcommandproc.h 3043 2011-08-29 22:03:03Z chao $ * *******************************************************************************/ -#ifndef WE_DMLCOMMANDPROC_H__ -#define WE_DMLCOMMANDPROC_H__ +#pragma once #include #include @@ -137,4 +136,3 @@ private: } #undef EXPORT -#endif diff --git a/writeengine/server/we_getfilesizes.h b/writeengine/server/we_getfilesizes.h index 7545955a1..012af80f8 100644 --- a/writeengine/server/we_getfilesizes.h +++ b/writeengine/server/we_getfilesizes.h @@ -19,8 +19,7 @@ * $Id: we_getfilesizes.h 4450 2013-04-15 14:13:24Z chao $ * *******************************************************************************/ -#ifndef WE_GETFILESIZES_H__ -#define WE_GETFILESIZES_H__ +#pragma once #include #include @@ -81,4 +80,3 @@ private: } -#endif diff --git a/writeengine/server/we_message_handlers.h b/writeengine/server/we_message_handlers.h index ddee04a92..be4021e85 100644 --- a/writeengine/server/we_message_handlers.h +++ b/writeengine/server/we_message_handlers.h @@ -19,8 +19,7 @@ * $Id: we_message_handlers.h 4450 2013-01-21 14:13:24Z rdempsey $ * *******************************************************************************/ -#ifndef WE_MESSAGE_HANDLERS_H__ -#define WE_MESSAGE_HANDLERS_H__ +#pragma once #include "bytestream.h" @@ -32,5 +31,4 @@ extern messageqcpp::ByteStream::byte doMsg2(messageqcpp::ByteStream& bs, std::st extern messageqcpp::ByteStream::byte doUpdateSyscolumnNextval(messageqcpp::ByteStream& bs, std::string err); } -#endif diff --git a/writeengine/server/we_messages.h b/writeengine/server/we_messages.h index 46870ca4a..bc7d6c6b1 100644 --- a/writeengine/server/we_messages.h +++ b/writeengine/server/we_messages.h @@ -19,8 +19,7 @@ * $Id: we_messages.h 4609 2013-04-19 15:32:02Z chao $ * *******************************************************************************/ -#ifndef WE_MESSAGES_H__ -#define WE_MESSAGES_H__ +#pragma once namespace WriteEngine { @@ -118,5 +117,4 @@ enum ServerMessages } -#endif diff --git a/writeengine/server/we_observer.h b/writeengine/server/we_observer.h index ac3039318..9829adaeb 100644 --- a/writeengine/server/we_observer.h +++ b/writeengine/server/we_observer.h @@ -27,8 +27,7 @@ * Author: bpaul@calpont.com */ -#ifndef OBSERVER_H_ -#define OBSERVER_H_ +#pragma once #include @@ -66,4 +65,3 @@ private: } -#endif /* OBSERVER_H_ */ diff --git a/writeengine/server/we_readthread.h b/writeengine/server/we_readthread.h index 39f6267dd..f96b20baf 100644 --- a/writeengine/server/we_readthread.h +++ b/writeengine/server/we_readthread.h @@ -19,8 +19,7 @@ * $Id: we_readthread.h 4609 2013-04-19 15:32:02Z chao $ * *******************************************************************************/ -#ifndef WE_SRV_READTHREAD_H__ -#define WE_SRV_READTHREAD_H__ +#pragma once #include #include @@ -156,5 +155,4 @@ public: } -#endif diff --git a/writeengine/shared/we_blockop.h b/writeengine/shared/we_blockop.h index b9bc870ea..08dc3a9a7 100644 --- a/writeengine/shared/we_blockop.h +++ b/writeengine/shared/we_blockop.h @@ -21,8 +21,7 @@ *******************************************************************************/ /** @file */ -#ifndef _WE_BLOCKOP_H_ -#define _WE_BLOCKOP_H_ +#pragma once #include @@ -138,4 +137,3 @@ private: #undef EXPORT -#endif // _WE_BLOCKOP_H_ diff --git a/writeengine/shared/we_brm.h b/writeengine/shared/we_brm.h index 2b43397b4..c5823f232 100644 --- a/writeengine/shared/we_brm.h +++ b/writeengine/shared/we_brm.h @@ -21,8 +21,7 @@ *******************************************************************************/ /** @file */ -#ifndef _WE_BRM_H_ -#define _WE_BRM_H_ +#pragma once #include #include @@ -768,4 +767,3 @@ inline int BRMWrapper::takeSnapshot() #undef EXPORT -#endif // _WE_BRM_H_ diff --git a/writeengine/shared/we_bulkrollbackfile.h b/writeengine/shared/we_bulkrollbackfile.h index 52ee066e3..d200bbecd 100644 --- a/writeengine/shared/we_bulkrollbackfile.h +++ b/writeengine/shared/we_bulkrollbackfile.h @@ -27,8 +27,7 @@ * file did not exist prior to an aborted bulk load. */ -#ifndef WE_BULKROLLBACKFILE_H_ -#define WE_BULKROLLBACKFILE_H_ +#pragma once #include @@ -204,4 +203,3 @@ inline int BulkRollbackFile::buildDirName( OID oid, } //end of namespace -#endif // WE_BULKROLLBACKFILE_H_ diff --git a/writeengine/shared/we_bulkrollbackfilecompressed.h b/writeengine/shared/we_bulkrollbackfilecompressed.h index ab9e8439c..82478da74 100644 --- a/writeengine/shared/we_bulkrollbackfilecompressed.h +++ b/writeengine/shared/we_bulkrollbackfilecompressed.h @@ -23,8 +23,7 @@ * Contains class to restore compressed db files on behalf of BulkRollBackMgr. */ -#ifndef WE_BULKROLLBACKFILECOMPRESSED_H_ -#define WE_BULKROLLBACKFILECOMPRESSED_H_ +#pragma once #include #include @@ -154,4 +153,3 @@ private: } //end of namespace -#endif // WE_BULKROLLBACKFILECOMPRESSED_H_ diff --git a/writeengine/shared/we_bulkrollbackfilecompressedhdfs.h b/writeengine/shared/we_bulkrollbackfilecompressedhdfs.h index fc90e4b99..d8e2d2a93 100644 --- a/writeengine/shared/we_bulkrollbackfilecompressedhdfs.h +++ b/writeengine/shared/we_bulkrollbackfilecompressedhdfs.h @@ -19,8 +19,7 @@ * Class to restore compressed hdfs db files on behalf of BulkRollBackMgr. */ -#ifndef WE_BULKROLLBACKFILECOMPRESSEDHDFS_H_ -#define WE_BULKROLLBACKFILECOMPRESSEDHDFS_H_ +#pragma once #include #include @@ -136,4 +135,3 @@ private: } //end of namespace -#endif // WE_BULKROLLBACKFILECOMPRESSEDHDFS_H_ diff --git a/writeengine/shared/we_bulkrollbackmgr.h b/writeengine/shared/we_bulkrollbackmgr.h index 433dcdadd..649210d8d 100644 --- a/writeengine/shared/we_bulkrollbackmgr.h +++ b/writeengine/shared/we_bulkrollbackmgr.h @@ -24,8 +24,7 @@ * based on HWM meta data saved by a bulk load. */ -#ifndef WE_BULKROLLBACKMGR_H_ -#define WE_BULKROLLBACKMGR_H_ +#pragma once #ifdef _MSC_VER #define WIN32_LEAN_AND_MEAN @@ -234,4 +233,3 @@ private: #undef EXPORT -#endif // WE_BULKROLLBACKMGR_H_ diff --git a/writeengine/shared/we_cache.h b/writeengine/shared/we_cache.h index 70d302851..5cd7ee58c 100644 --- a/writeengine/shared/we_cache.h +++ b/writeengine/shared/we_cache.h @@ -21,8 +21,7 @@ ******************************************************************************************/ /** @file */ -#ifndef _WE_CACHE_H_ -#define _WE_CACHE_H_ +#pragma once #include #ifdef _MSC_VER #include @@ -227,4 +226,3 @@ private: #undef EXPORT -#endif // _WE_CACHE_H_ diff --git a/writeengine/shared/we_chunkmanager.h b/writeengine/shared/we_chunkmanager.h index 198c67cce..22d83379a 100644 --- a/writeengine/shared/we_chunkmanager.h +++ b/writeengine/shared/we_chunkmanager.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef CHUNK_MANAGER_H -#define CHUNK_MANAGER_H +#pragma once #include #include @@ -393,5 +392,4 @@ protected: #undef EXPORT -#endif // CHUNK_MANAGER_H diff --git a/writeengine/shared/we_config.h b/writeengine/shared/we_config.h index d2ad2ae50..3916980f6 100644 --- a/writeengine/shared/we_config.h +++ b/writeengine/shared/we_config.h @@ -21,8 +21,7 @@ *******************************************************************************/ /** @file */ -#ifndef WE_CONFIG_H_ -#define WE_CONFIG_H_ +#pragma once #include #include @@ -198,4 +197,3 @@ private: #undef EXPORT -#endif // WE_CONFIG_H_ diff --git a/writeengine/shared/we_confirmhdfsdbfile.h b/writeengine/shared/we_confirmhdfsdbfile.h index f0d51a312..5c6e13b6b 100644 --- a/writeengine/shared/we_confirmhdfsdbfile.h +++ b/writeengine/shared/we_confirmhdfsdbfile.h @@ -17,8 +17,7 @@ /** @file */ -#ifndef CONFIRM_HDFS_DBFILE_H -#define CONFIRM_HDFS_DBFILE_H +#pragma once #include @@ -136,4 +135,3 @@ private: #undef EXPORT -#endif // CONFIRM_HDFS_DBFILE_H diff --git a/writeengine/shared/we_convertor.h b/writeengine/shared/we_convertor.h index 78c926f7c..ba4613a74 100644 --- a/writeengine/shared/we_convertor.h +++ b/writeengine/shared/we_convertor.h @@ -21,8 +21,7 @@ *******************************************************************************/ /** @file */ -#ifndef _WE_CONVERTOR_H_ -#define _WE_CONVERTOR_H_ +#pragma once #include #include @@ -150,4 +149,3 @@ private: #undef EXPORT -#endif // _WE_CONVERTOR_H_ diff --git a/writeengine/shared/we_dbfileop.h b/writeengine/shared/we_dbfileop.h index 1ec160573..328dee85f 100644 --- a/writeengine/shared/we_dbfileop.h +++ b/writeengine/shared/we_dbfileop.h @@ -19,8 +19,7 @@ /** @file */ -#ifndef _WE_DBFILEOP_H_ -#define _WE_DBFILEOP_H_ +#pragma once #include "we_type.h" #include "we_fileop.h" @@ -251,4 +250,3 @@ private: #undef EXPORT -#endif // _WE_DBFILEOP_H_ diff --git a/writeengine/shared/we_dbrootextenttracker.h b/writeengine/shared/we_dbrootextenttracker.h index b7d0c3618..508b01398 100644 --- a/writeengine/shared/we_dbrootextenttracker.h +++ b/writeengine/shared/we_dbrootextenttracker.h @@ -32,8 +32,7 @@ * countered. */ -#ifndef WE_DBROOTEXTENTTRACKER_H_ -#define WE_DBROOTEXTENTTRACKER_H_ +#pragma once #include #include @@ -237,4 +236,3 @@ private: #undef EXPORT -#endif // WE_DBROOTEXTENTTRACKER_H_ diff --git a/writeengine/shared/we_define.h b/writeengine/shared/we_define.h index bf987c31c..00b5db70b 100644 --- a/writeengine/shared/we_define.h +++ b/writeengine/shared/we_define.h @@ -21,8 +21,7 @@ #undef NO_ERROR -#ifndef _WE_DEFINE_H_ -#define _WE_DEFINE_H_ +#pragma once #include #include #include @@ -398,4 +397,3 @@ private: #undef EXPORT -#endif // _WE_DEFINE_H_ diff --git a/writeengine/shared/we_fileop.h b/writeengine/shared/we_fileop.h index 267bff6d4..ef273c26f 100644 --- a/writeengine/shared/we_fileop.h +++ b/writeengine/shared/we_fileop.h @@ -19,8 +19,7 @@ /** @file */ -#ifndef _WE_FILEOP_H_ -#define _WE_FILEOP_H_ +#pragma once #include #include #include @@ -608,4 +607,3 @@ inline TxnID FileOp::getTransId() const #undef EXPORT -#endif // _WE_FILEOP_H_ diff --git a/writeengine/shared/we_index.h b/writeengine/shared/we_index.h index bcd88e5e9..dd8430afc 100644 --- a/writeengine/shared/we_index.h +++ b/writeengine/shared/we_index.h @@ -21,8 +21,7 @@ ******************************************************************************************/ /** @file */ -#ifndef _WE_INDEX_H_ -#define _WE_INDEX_H_ +#pragma once #include @@ -452,4 +451,3 @@ struct IdxLoadParam }; } //end of namespace -#endif // _WE_INDEX_H_ diff --git a/writeengine/shared/we_log.h b/writeengine/shared/we_log.h index bc226789d..899cfdc0f 100644 --- a/writeengine/shared/we_log.h +++ b/writeengine/shared/we_log.h @@ -21,8 +21,7 @@ *******************************************************************************/ /** @file */ -#ifndef _WE_LOG_H_ -#define _WE_LOG_H_ +#pragma once #include #include @@ -125,4 +124,3 @@ private: #undef EXPORT -#endif // _WE_LOG_H_ diff --git a/writeengine/shared/we_macro.h b/writeengine/shared/we_macro.h index da85b5dec..7f9ad4cf7 100644 --- a/writeengine/shared/we_macro.h +++ b/writeengine/shared/we_macro.h @@ -21,8 +21,7 @@ ******************************************************************************************/ /** @file */ -#ifndef _WE_MACRO_H_ -#define _WE_MACRO_H_ +#pragma once #include @@ -50,4 +49,3 @@ namespace WriteEngine return NO_ERROR; } //end of namespace -#endif // _WE_MACRO_H_ diff --git a/writeengine/shared/we_obj.h b/writeengine/shared/we_obj.h index 52019d23b..0a37de23a 100644 --- a/writeengine/shared/we_obj.h +++ b/writeengine/shared/we_obj.h @@ -21,8 +21,7 @@ ******************************************************************************************/ /** @file */ -#ifndef _WE_OBJ_H_ -#define _WE_OBJ_H_ +#pragma once //#include #include @@ -93,4 +92,3 @@ private: } //end of namespace -#endif // _WE_OBJ_H_ diff --git a/writeengine/shared/we_rbmetawriter.h b/writeengine/shared/we_rbmetawriter.h index e3b7a1bd3..ef83e59b5 100644 --- a/writeengine/shared/we_rbmetawriter.h +++ b/writeengine/shared/we_rbmetawriter.h @@ -27,8 +27,7 @@ * Nothing. */ -#ifndef WE_RBMETAWRITER_H_ -#define WE_RBMETAWRITER_H_ +#pragma once #include #include @@ -378,4 +377,3 @@ private: #undef EXPORT -#endif // WE_RBMETAWRITER_H_ diff --git a/writeengine/shared/we_simplesyslog.h b/writeengine/shared/we_simplesyslog.h index d7668f6b2..6f62f608e 100644 --- a/writeengine/shared/we_simplesyslog.h +++ b/writeengine/shared/we_simplesyslog.h @@ -21,8 +21,7 @@ *******************************************************************************/ /** @file */ -#ifndef _WE_SIMPLESYSLOG_H_ -#define _WE_SIMPLESYSLOG_H_ +#pragma once #include @@ -79,4 +78,3 @@ private: #undef EXPORT } //end of namespace -#endif // _WE_SIMPLESYSLOG_H_ diff --git a/writeengine/shared/we_stats.h b/writeengine/shared/we_stats.h index f5e8d3c84..0de1f24f1 100644 --- a/writeengine/shared/we_stats.h +++ b/writeengine/shared/we_stats.h @@ -21,8 +21,7 @@ *******************************************************************************/ /** @file */ -#ifndef _WE_STATS_H_ -#define _WE_STATS_H_ +#pragma once #include #ifdef PROFILE #include @@ -180,4 +179,3 @@ private: } //end of namespace -#endif // _WE_STATIS_H_ diff --git a/writeengine/shared/we_type.h b/writeengine/shared/we_type.h index e1f5eaf7a..086b1fd01 100644 --- a/writeengine/shared/we_type.h +++ b/writeengine/shared/we_type.h @@ -21,8 +21,7 @@ /** @file */ -#ifndef _WE_TYPE_H_ -#define _WE_TYPE_H_ +#pragma once #undef EXPORT #undef DELETE @@ -546,4 +545,3 @@ private: } //end of namespace -#endif // _WE_TYPE_H_ diff --git a/writeengine/shared/we_typeext.h b/writeengine/shared/we_typeext.h index 59e69e266..393edb487 100644 --- a/writeengine/shared/we_typeext.h +++ b/writeengine/shared/we_typeext.h @@ -27,8 +27,7 @@ * in we_type.h and/or we_define.h. */ -#ifndef _WE_TYPEEXT_H_ -#define _WE_TYPEEXT_H_ +#pragma once #include #include #include @@ -111,4 +110,3 @@ inline bool WeUIDGID::chownPath(std::ostringstream& error, } //end of namespace -#endif // _WE_TYPEEXT_H_ diff --git a/writeengine/splitter/we_brmupdater.h b/writeengine/splitter/we_brmupdater.h index c575b3bd1..ede21c005 100644 --- a/writeengine/splitter/we_brmupdater.h +++ b/writeengine/splitter/we_brmupdater.h @@ -27,8 +27,7 @@ * Author: bpaul */ -#ifndef WE_BRMUPDATER_H_ -#define WE_BRMUPDATER_H_ +#pragma once namespace WriteEngine @@ -87,4 +86,3 @@ private: }; } /* namespace WriteEngine */ -#endif /* WE_BRMUPDATER_H_ */ diff --git a/writeengine/splitter/we_cmdargs.h b/writeengine/splitter/we_cmdargs.h index 2fcdf9b89..c166b9ca1 100644 --- a/writeengine/splitter/we_cmdargs.h +++ b/writeengine/splitter/we_cmdargs.h @@ -19,8 +19,7 @@ * $Id$ * *******************************************************************************/ -#ifndef WE_CMDARGS_H_ -#define WE_CMDARGS_H_ +#pragma once #include @@ -353,4 +352,3 @@ inline std::string& WECmdArgs::getUsername() } -#endif /* WE_CMDARGS_H_ */ diff --git a/writeengine/splitter/we_filereadthread.h b/writeengine/splitter/we_filereadthread.h index f81f5d492..5e340a1ce 100644 --- a/writeengine/splitter/we_filereadthread.h +++ b/writeengine/splitter/we_filereadthread.h @@ -27,8 +27,7 @@ * Author: bpaul */ -#ifndef WE_FILEREADTHREAD_H_ -#define WE_FILEREADTHREAD_H_ +#pragma once #include "we_cmdargs.h" #include "libmarias3/marias3.h" @@ -174,4 +173,3 @@ private: }; } /* namespace WriteEngine */ -#endif /* WE_FILEREADTHREAD_H_ */ diff --git a/writeengine/splitter/we_respreadthread.h b/writeengine/splitter/we_respreadthread.h index b14c92b37..770f5c090 100644 --- a/writeengine/splitter/we_respreadthread.h +++ b/writeengine/splitter/we_respreadthread.h @@ -27,8 +27,7 @@ * Author: bpaul */ -#ifndef WE_RESPREADTHREAD_H_ -#define WE_RESPREADTHREAD_H_ +#pragma once namespace WriteEngine { @@ -48,4 +47,3 @@ private: }; } /* namespace WriteEngine */ -#endif /* WE_RESPREADTHREAD_H_ */ diff --git a/writeengine/splitter/we_sdhandler.h b/writeengine/splitter/we_sdhandler.h index e8d624e1b..3e06dae6f 100644 --- a/writeengine/splitter/we_sdhandler.h +++ b/writeengine/splitter/we_sdhandler.h @@ -27,8 +27,7 @@ * Author: bpaul */ -#ifndef WE_SPLITTERDATAHANDLER_H_ -#define WE_SPLITTERDATAHANDLER_H_ +#pragma once #include "liboamcpp.h" @@ -409,4 +408,3 @@ private: } /* namespace WriteEngine */ -#endif /* WE_SPLITTERDATAHANDLER_H_ */ diff --git a/writeengine/splitter/we_splclient.h b/writeengine/splitter/we_splclient.h index 0a33aadec..e0cde79df 100644 --- a/writeengine/splitter/we_splclient.h +++ b/writeengine/splitter/we_splclient.h @@ -27,8 +27,7 @@ * Author: bpaul */ -#ifndef WE_SPLCLIENT_H_ -#define WE_SPLCLIENT_H_ +#pragma once #include "threadsafequeue.h" #include "resourcemanager.h" @@ -400,4 +399,3 @@ private: //------------------------------------------------------------------------------ } /* namespace WriteEngine */ -#endif /* WE_SPLCLIENT_H_ */ diff --git a/writeengine/splitter/we_splitterapp.h b/writeengine/splitter/we_splitterapp.h index e3e1d1b92..237e4d053 100644 --- a/writeengine/splitter/we_splitterapp.h +++ b/writeengine/splitter/we_splitterapp.h @@ -26,8 +26,7 @@ * Author: bpaul */ -#ifndef WE_SPLITTERAPP_H_ -#define WE_SPLITTERAPP_H_ +#pragma once #include #include @@ -98,4 +97,3 @@ public: }; } /* namespace WriteEngine */ -#endif /* WE_SPLITTERAPP_H_ */ diff --git a/writeengine/splitter/we_tablelockgrabber.h b/writeengine/splitter/we_tablelockgrabber.h index cc253f9cd..7ef342145 100644 --- a/writeengine/splitter/we_tablelockgrabber.h +++ b/writeengine/splitter/we_tablelockgrabber.h @@ -27,8 +27,7 @@ * Author: bpaul */ -#ifndef WE_TABLELOCKGRABBER_H_ -#define WE_TABLELOCKGRABBER_H_ +#pragma once @@ -60,4 +59,3 @@ private: } /* namespace WriteEngine */ -#endif /* WE_TABLELOCKGRABBER_H_ */ diff --git a/writeengine/splitter/we_xmlgetter.h b/writeengine/splitter/we_xmlgetter.h index 935cd4d27..ac330b4f2 100644 --- a/writeengine/splitter/we_xmlgetter.h +++ b/writeengine/splitter/we_xmlgetter.h @@ -27,8 +27,7 @@ * Author: bpaul */ -#ifndef WE_XMLGETTER_H_ -#define WE_XMLGETTER_H_ +#pragma once #include @@ -68,4 +67,3 @@ private: }; } /* namespace WriteEngine */ -#endif /* WE_XMLGETTER_H_ */ diff --git a/writeengine/wrapper/we_colop.h b/writeengine/wrapper/we_colop.h index 87afd1eea..b6d9fbd33 100644 --- a/writeengine/wrapper/we_colop.h +++ b/writeengine/wrapper/we_colop.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef _WE_COLOP_H_ -#define _WE_COLOP_H_ +#pragma once #include @@ -348,4 +347,3 @@ private: #undef EXPORT -#endif // _WE_COLOP_H_ diff --git a/writeengine/wrapper/we_colopcompress.h b/writeengine/wrapper/we_colopcompress.h index 33da38646..480bf5bd0 100644 --- a/writeengine/wrapper/we_colopcompress.h +++ b/writeengine/wrapper/we_colopcompress.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef _WE_COLOP_COMPRESS_H_ -#define _WE_COLOP_COMPRESS_H_ +#pragma once #include @@ -194,4 +193,3 @@ private: #undef EXPORT -#endif // _WE_COLOP_COMPRESS_H_ diff --git a/writeengine/wrapper/we_dctnrycompress.h b/writeengine/wrapper/we_dctnrycompress.h index 8ec3ad3ac..89c7d9d02 100644 --- a/writeengine/wrapper/we_dctnrycompress.h +++ b/writeengine/wrapper/we_dctnrycompress.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef _WE_DCTNRY_COMPRESS_H_ -#define _WE_DCTNRY_COMPRESS_H_ +#pragma once #include @@ -174,4 +173,3 @@ protected: #undef EXPORT -#endif // _WE_DCTNRY_COMPRESS_H_ diff --git a/writeengine/wrapper/we_tablemetadata.h b/writeengine/wrapper/we_tablemetadata.h index 2a6f8a60b..aa43dd7f1 100644 --- a/writeengine/wrapper/we_tablemetadata.h +++ b/writeengine/wrapper/we_tablemetadata.h @@ -19,8 +19,7 @@ // /** @file */ -#ifndef WE_TABLEMETADATA_H__ -#define WE_TABLEMETADATA_H__ +#pragma once #include #include "we_type.h" @@ -99,6 +98,5 @@ private: #undef EXPORT -#endif // vim:ts=4 sw=4: diff --git a/writeengine/wrapper/writeengine.h b/writeengine/wrapper/writeengine.h index a3f9634fc..0c5a1a5c0 100644 --- a/writeengine/wrapper/writeengine.h +++ b/writeengine/wrapper/writeengine.h @@ -20,8 +20,7 @@ /** @file */ -#ifndef _WRITE_ENGINE_H_ -#define _WRITE_ENGINE_H_ +#pragma once #include #include @@ -832,4 +831,3 @@ private: #undef EXPORT -#endif // _WRITE_ENGINE_H_ diff --git a/writeengine/xml/we_xmlgendata.h b/writeengine/xml/we_xmlgendata.h index e68eca04d..e72501fc6 100644 --- a/writeengine/xml/we_xmlgendata.h +++ b/writeengine/xml/we_xmlgendata.h @@ -20,8 +20,7 @@ * ***********************************************************************/ /** @file */ -#ifndef _WE_XMLGENDATA_H_ -#define _WE_XMLGENDATA_H_ +#pragma once #include #include @@ -120,4 +119,3 @@ private: #undef EXPORT -#endif diff --git a/writeengine/xml/we_xmlgenproc.h b/writeengine/xml/we_xmlgenproc.h index 4b7ec4ed5..37eb77993 100644 --- a/writeengine/xml/we_xmlgenproc.h +++ b/writeengine/xml/we_xmlgenproc.h @@ -20,8 +20,7 @@ * ***********************************************************************/ /** @file */ -#ifndef WE_XMLGENPROC_H -#define WE_XMLGENPROC_H +#pragma once #include #include @@ -138,4 +137,3 @@ private: #undef EXPORT -#endif diff --git a/writeengine/xml/we_xmljob.h b/writeengine/xml/we_xmljob.h index 3f144975b..f5ba770e6 100644 --- a/writeengine/xml/we_xmljob.h +++ b/writeengine/xml/we_xmljob.h @@ -21,8 +21,7 @@ *******************************************************************************/ /** @file */ -#ifndef _WE_XMLJOB_H_ -#define _WE_XMLJOB_H_ +#pragma once #include #include @@ -169,4 +168,3 @@ private: #undef EXPORT -#endif // _WE_XMLJOB_H_ diff --git a/writeengine/xml/we_xmlop.h b/writeengine/xml/we_xmlop.h index a7f8dcd69..273765f51 100644 --- a/writeengine/xml/we_xmlop.h +++ b/writeengine/xml/we_xmlop.h @@ -21,8 +21,7 @@ *******************************************************************************/ /** @file */ -#ifndef _WE_XMLOP_H_ -#define _WE_XMLOP_H_ +#pragma once #include "we_xmltag.h" #include "we_type.h" @@ -116,4 +115,3 @@ private: } //end of namespace -#endif // _WE_XMLOP_H_ diff --git a/writeengine/xml/we_xmltag.h b/writeengine/xml/we_xmltag.h index c9e991179..c37ddb8da 100644 --- a/writeengine/xml/we_xmltag.h +++ b/writeengine/xml/we_xmltag.h @@ -21,8 +21,7 @@ *******************************************************************************/ /** @file */ -#ifndef _WE_XMLTAG_H_ -#define _WE_XMLTAG_H_ +#pragma once #include /** Namespace WriteEngine */ @@ -124,4 +123,3 @@ const char xmlTagTable[NUM_OF_XML_TAGS + 1][MAX_XML_TAG_NAME_SIZE] = }; } //end of namespace -#endif // _WE_XMLTAG_H_