replace header guards with #pragma once

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:
 

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:
 

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

primitives/blockcache/filebuffer.h

@@ -23,8 +23,7 @@
  *                                                                         *
 ***************************************************************************/
 
-#ifndef FILEBUFFER_H
-#define FILEBUFFER_H
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -183,4 +182,3 @@ private:
 typedef std::vector<FileBuffer> FileBufferPool_t;
 
 }
-#endif

primitives/blockcache/filebuffermgr.h

@@ -22,8 +22,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILEBUFFERMGR_H
-#define FILEBUFFERMGR_H
+#pragma once
 #include <iostream>
 #include <fstream>
 #include <iomanip>
@@ -240,4 +239,3 @@ private:
 };
 
 }
-#endif

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:
 

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 <string>
 
@@ -25,5 +24,4 @@ namespace fsutils
 const std::string symname2devname(const std::string& sympath);
 }
 
-#endif
 

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<BRM::FileInfo>& files);
 
 }
-#endif
 // vim:ts=4 sw=4:

primitives/blockcache/stats.h

@@ -21,8 +21,7 @@
 
 /** @file */
 
-#ifndef PRIMPROC_STATS_H
-#define PRIMPROC_STATS_H
+#pragma once
 
 #ifndef _MSC_VER
 #include <pthread.h>
@@ -73,4 +72,3 @@ private:
 
 }
 
-#endif //PRIMPROC_STATS_H

primitives/linux-port/primitiveprocessor.h

@@ -23,8 +23,7 @@
 
 /** @file */
 
-#ifndef PRIMITIVEPROCESSOR_H_
-#define PRIMITIVEPROCESSOR_H_
+#pragma once
 
 #include <stdexcept>
 #include <vector>
@@ -587,6 +586,5 @@ boost::shared_ptr<ParsedColumnFilter> _parseColumnFilter(
 
 } //namespace primitives
 
-#endif
 // vim:ts=4 sw=4:
 

primitives/primproc/batchprimitiveprocessor.h

@@ -28,8 +28,7 @@
 //
 //
 
-#ifndef BATCHPRIMITIVEPROCESSOR_H_
-#define BATCHPRIMITIVEPROCESSOR_H_
+#pragma once
 
 #include <boost/scoped_array.hpp>
 #include <boost/shared_ptr.hpp>
@@ -439,4 +438,3 @@ private:
 
 }
 
-#endif

primitives/primproc/bppseeder.h

@@ -28,8 +28,7 @@
 //
 //
 
-#ifndef BPPSEEDER_H_
-#define BPPSEEDER_H_
+#pragma once
 
 #include <fstream>
 #include <iostream>
@@ -100,4 +99,3 @@ private:
 
 };
 
-#endif

primitives/primproc/bppsendthread.h

@@ -29,8 +29,7 @@
 #include <boost/thread/thread.hpp>
 #include <boost/thread/condition.hpp>
 
-#ifndef BPPSENDTHREAD_H
-#define BPPSENDTHREAD_H
+#pragma once
 
 namespace primitiveprocessor
 {
@@ -129,5 +128,4 @@ private:
 
 }
 
-#endif
 

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<messageqcpp::ByteStream::hexbyte>(uint
 
 } // namespace
 
-#endif
 // vim:ts=4 sw=4:
 

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 <boost/shared_ptr.hpp>
 #include <boost/uuid/uuid.hpp>
@@ -123,4 +122,3 @@ protected:
 
 }
 
-#endif

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

primitives/primproc/filtercommand.h

@@ -24,8 +24,7 @@
  * class FilterCommand interface
  */
 
-#ifndef PRIMITIVES_FILTERCOMMAND_H_
-#define PRIMITIVES_FILTERCOMMAND_H_
+#pragma once
 
 #include <string>
 #include <boost/scoped_array.hpp>
@@ -168,5 +167,4 @@ private:
 };
 
 
-#endif // PRIMITIVES_FILTERCOMMAND_H_
 

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

primitives/primproc/pp_logger.h

@@ -21,8 +21,7 @@
 
 /** @file */
 
-#ifndef PRIMPROC_LOGGER_H_
-#define PRIMPROC_LOGGER_H_
+#pragma once
 
 #include <map>
 #include <boost/thread.hpp>
@@ -68,5 +67,4 @@ private:
 
 }
 
-#endif
 

primitives/primproc/primitiveserver.h

@@ -22,8 +22,7 @@
  *
  ***********************************************************************/
 /** @file */
-#ifndef PRIMITIVESERVER_H
-#define PRIMITIVESERVER_H
+#pragma once
 
 #include <map>
 #ifdef _MSC_VER
@@ -186,4 +185,3 @@ private:
 
 
 } // namespace primitiveprocessor
-#endif //PRIMITIVESERVER_H

primitives/primproc/primproc.h

@@ -23,8 +23,7 @@
 /**
  * @file
  */
-#ifndef PRIMPROC_H
-#define PRIMPROC_H
+#pragma once
 
 #include <string>
 #include <sstream>
@@ -115,4 +114,3 @@ const int MAX_BUFFER_SIZE = 32768 * 2;
 extern Logger* mlp;
 }
 
-#endif //PRIMPROC_H

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

primitives/primproc/rtscommand.h

@@ -28,8 +28,7 @@
 //
 //
 
-#ifndef RTSCOMMAND_H_
-#define RTSCOMMAND_H_
+#pragma once
 
 #include "command.h"
 #include <boost/scoped_ptr.hpp>
@@ -86,4 +85,3 @@ private:
 
 }
 
-#endif

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