Replaced #ifdef based multiple include guards by #pragma once.

Fixed h/rfcntl.h which missed multiple inclusion guards entirely.

castor/BaseAddress.hpp

@@ -22,8 +22,7 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#ifndef CASTOR_BASEADDRESS_HPP
-#define CASTOR_BASEADDRESS_HPP
+#pragma once
 
 // Include Files
 #include "castor/IAddress.hpp"
@@ -203,4 +202,3 @@ namespace castor {
 
 } /* end of namespace castor */
 
-#endif // CASTOR_BASEADDRESS_HPP

castor/BaseCnvSvc.hpp

@@ -23,8 +23,7 @@
  * @author Sebastien Ponce
  *****************************************************************************/
 
-#ifndef CASTOR_BASECNVSVC_HPP
-#define CASTOR_BASECNVSVC_HPP 1
+#pragma once
 
 // Include Files
 #include <map>
@@ -288,4 +287,3 @@ namespace castor {
 
 } // end of namespace castor
 
-#endif // CASTOR_BASECNVSVC_HPP

castor/BaseObject.hpp

@@ -23,8 +23,7 @@
  * @author Sebastien Ponce
  *****************************************************************************/
 
-#ifndef CASTOR_BASEOBJECT_HPP
-#define CASTOR_BASEOBJECT_HPP 1
+#pragma once
 
 // Include Files
 #include "castor/dlf/Dlf.hpp"
@@ -113,4 +112,3 @@ namespace castor {
 
 } // end of namespace castor
 
-#endif // CASTOR_BASEOBJECT_HPP

castor/BaseSvc.hpp

@@ -23,8 +23,7 @@
  * @author Sebastien Ponce
  *****************************************************************************/
 
-#ifndef CASTOR_BASESVC_HPP 
-#define CASTOR_BASESVC_HPP 1
+#pragma once
 
 // Include Files
 #include <string>
@@ -89,4 +88,3 @@ namespace castor {
   
 } // end of castor namespace
 
-#endif // CASTOR_BASESVC_HPP

castor/CnvFactory.hpp

@@ -23,8 +23,7 @@
  * @author Sebastien Ponce
  *****************************************************************************/
 
-#ifndef CASTOR_CNVFACTORY_HPP
-#define CASTOR_CNVFACTORY_HPP 1
+#pragma once
 
 // Include Files
 #include "ICnvFactory.hpp"
@@ -92,4 +91,3 @@ castor::CnvFactory<Converter>::CnvFactory() {
   castor::Converters::instance()->addFactory(this);
 }
 
-#endif // CASTOR_CNVFACTORY_HPP

castor/Constants.h

@@ -23,8 +23,7 @@
  * @author Sebastien Ponce
  *****************************************************************************/
 
-#ifndef CASTOR_CONSTANTS_H 
-#define CASTOR_CONSTANTS_H 1
+#pragma once
 
 #define C_ObjectsIds ObjectsIds
 #define C_ServicesIds ServicesIds
@@ -56,4 +55,3 @@ const char* C_RepresentationsIdsStrings(unsigned int type);
 
 #include "Constants.hpp"
 
-#endif /* CASTOR_CONSTANTS_H */

castor/Constants.hpp

@@ -27,8 +27,7 @@
  * @author Sebastien Ponce
  *****************************************************************************/
 
-#ifndef CASTOR_CONSTANTS_HPP
-#define CASTOR_CONSTANTS_HPP 1
+#pragma once
 
 #ifdef __cplusplus
 namespace castor {
@@ -334,4 +333,3 @@ namespace castor {
 } /* end of namespace castor */
 #endif
 
-#endif /* CASTOR_CONSTANTS_HPP */

castor/Converters.hpp

@@ -23,8 +23,7 @@
  * @author Sebastien Ponce
  *****************************************************************************/
 
-#ifndef CASTOR_CONVERTERS_HPP
-#define CASTOR_CONVERTERS_HPP 1
+#pragma once
 
 //Include Files
 #include <map>
@@ -77,4 +76,3 @@ namespace castor {
 
 } // end of namespace castor
 
-#endif // CASTOR_CONVERTERS_HPP

castor/Factories.hpp

@@ -23,8 +23,7 @@
  * @author Sebastien Ponce
  *****************************************************************************/
 
-#ifndef CASTOR_FACTORIES_HPP 
-#define CASTOR_FACTORIES_HPP 1
+#pragma once
 
 //Include Files
 #include <map>
@@ -76,4 +75,3 @@ namespace castor {
 
 } // end of namespace castor
 
-#endif // CASTOR_FACTORIES_HPP

castor/IAddress.hpp

@@ -22,8 +22,7 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#ifndef CASTOR_IADDRESS_HPP
-#define CASTOR_IADDRESS_HPP
+#pragma once
 
 // Include Files
 #include "castor/IObject.hpp"
@@ -94,4 +93,3 @@ namespace castor {
 
 } /* end of namespace castor */
 
-#endif // CASTOR_IADDRESS_HPP

castor/IClient.hpp

@@ -22,8 +22,7 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#ifndef CASTOR_ICLIENT_HPP
-#define CASTOR_ICLIENT_HPP
+#pragma once
 
 // Include Files
 #include "castor/IObject.hpp"
@@ -75,4 +74,3 @@ namespace castor {
 
 } /* end of namespace castor */
 
-#endif // CASTOR_ICLIENT_HPP

castor/IClientFactory.hpp

@@ -23,8 +23,7 @@
  * @author Sebastien Ponce
  *****************************************************************************/
 
-#ifndef RH_CLIENTFACTORY_HPP 
-#define RH_CLIENTFACTORY_HPP 1
+#pragma once
 
 // Include Files
 #include "castor/exception/Exception.hpp"
@@ -71,4 +70,3 @@ namespace castor {
 
 } // end of namespace castor
 
-#endif // RH_CLIENTFACTORY_HPP

castor/ICnvFactory.hpp

@@ -23,8 +23,7 @@
  * @author Sebastien Ponce
  *****************************************************************************/
 
-#ifndef CASTOR_ICNVFACTORY_HPP
-#define CASTOR_ICNVFACTORY_HPP 1
+#pragma once
 
 // Include Files
 #include "IFactory.hpp"
@@ -72,4 +71,3 @@ namespace castor {
 
 } // end of namespace castor
 
-#endif // CASTOR_ICNVFACTORY_HPP

castor/ICnvSvc.hpp

@@ -23,8 +23,7 @@
  * @author Sebastien Ponce
  *****************************************************************************/
 
-#ifndef CASTOR_ICNVSVC_HPP
-#define CASTOR_ICNVSVC_HPP 1
+#pragma once
 
 // Include Files
 #include "castor/IService.hpp"
@@ -230,4 +229,3 @@ namespace castor {
 
 } // end of namespace castor
 
-#endif // CASTOR_ICNVSVC_HPP

castor/IConverter.hpp

@@ -23,8 +23,7 @@
  * @author Sebastien Ponce
  *****************************************************************************/
 
-#ifndef CASTOR_ICONVERTER_HPP
-#define CASTOR_ICONVERTER_HPP 1
+#pragma once
 
 // Include Files
 #include <vector>
@@ -197,4 +196,3 @@ namespace castor {
 
 } // end of namespace castor
 
-#endif // CASTOR_ICONVERTER_HPP

castor/IFactory.hpp

@@ -23,8 +23,7 @@
  * @author Sebastien Ponce
  *****************************************************************************/
 
-#ifndef CASTOR_IFACTORY_HPP
-#define CASTOR_IFACTORY_HPP 1
+#pragma once
 
 // Include Files
 #include <string>
@@ -58,4 +57,3 @@ namespace castor {
 
 } // end of namespace castor
 
-#endif // CASTOR_IFACTORY_HPP

castor/IObject.hpp

@@ -22,8 +22,7 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#ifndef CASTOR_IOBJECT_HPP
-#define CASTOR_IOBJECT_HPP
+#pragma once
 
 // Include Files
 #include "osdep.h"
@@ -98,4 +97,3 @@ namespace castor {
  */
 std::ostream& operator<<(std::ostream& s, const castor::IObject& addr);
 
-#endif // CASTOR_IOBJECT_HPP

castor/IService.hpp

@@ -23,8 +23,7 @@
  * @author Sebastien Ponce
  *****************************************************************************/
 
-#ifndef CASTOR_ISERVICE_HPP
-#define CASTOR_ISERVICE_HPP 1
+#pragma once
 
 // Include files
 #include <string>
@@ -72,4 +71,3 @@ namespace castor {
 
 } // end of namespace castor
 
-#endif // CASTOR_ISERVICE_HPP

castor/ISvcFactory.hpp

@@ -23,8 +23,7 @@
  * @author Sebastien Ponce
  *****************************************************************************/
 
-#ifndef CASTOR_ISVCFACTORY_HPP
-#define CASTOR_ISVCFACTORY_HPP 1
+#pragma once
 
 // Include Files
 #include "IFactory.hpp"
@@ -53,4 +52,3 @@ namespace castor {
 
 } // end of namespace castor
 
-#endif // CASTOR_ISVCFACTORY_HPP

castor/MessageAck.hpp

@@ -22,8 +22,7 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#ifndef CASTOR_MESSAGEACK_HPP
-#define CASTOR_MESSAGEACK_HPP
+#pragma once
 
 // Include Files
 #include "castor/IObject.hpp"
@@ -202,4 +201,3 @@ namespace castor {
 
 } /* end of namespace castor */
 
-#endif // CASTOR_MESSAGEACK_HPP