Commit 2b8cb0bd authored by Eric Cano's avatar Eric Cano
Browse files

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

Fixed h/rfcntl.h which missed multiple inclusion guards entirely.
parent e25a0df9
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
* @author Castor Dev team, castor-dev@cern.ch * @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_BASEADDRESS_HPP #pragma once
#define CASTOR_BASEADDRESS_HPP
// Include Files // Include Files
#include "castor/IAddress.hpp" #include "castor/IAddress.hpp"
...@@ -203,4 +202,3 @@ namespace castor { ...@@ -203,4 +202,3 @@ namespace castor {
} /* end of namespace castor */ } /* end of namespace castor */
#endif // CASTOR_BASEADDRESS_HPP
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
* @author Sebastien Ponce * @author Sebastien Ponce
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_BASECNVSVC_HPP #pragma once
#define CASTOR_BASECNVSVC_HPP 1
// Include Files // Include Files
#include <map> #include <map>
...@@ -288,4 +287,3 @@ namespace castor { ...@@ -288,4 +287,3 @@ namespace castor {
} // end of namespace castor } // end of namespace castor
#endif // CASTOR_BASECNVSVC_HPP
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
* @author Sebastien Ponce * @author Sebastien Ponce
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_BASEOBJECT_HPP #pragma once
#define CASTOR_BASEOBJECT_HPP 1
// Include Files // Include Files
#include "castor/dlf/Dlf.hpp" #include "castor/dlf/Dlf.hpp"
...@@ -113,4 +112,3 @@ namespace castor { ...@@ -113,4 +112,3 @@ namespace castor {
} // end of namespace castor } // end of namespace castor
#endif // CASTOR_BASEOBJECT_HPP
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
* @author Sebastien Ponce * @author Sebastien Ponce
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_BASESVC_HPP #pragma once
#define CASTOR_BASESVC_HPP 1
// Include Files // Include Files
#include <string> #include <string>
...@@ -89,4 +88,3 @@ namespace castor { ...@@ -89,4 +88,3 @@ namespace castor {
} // end of castor namespace } // end of castor namespace
#endif // CASTOR_BASESVC_HPP
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
* @author Sebastien Ponce * @author Sebastien Ponce
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_CNVFACTORY_HPP #pragma once
#define CASTOR_CNVFACTORY_HPP 1
// Include Files // Include Files
#include "ICnvFactory.hpp" #include "ICnvFactory.hpp"
...@@ -92,4 +91,3 @@ castor::CnvFactory<Converter>::CnvFactory() { ...@@ -92,4 +91,3 @@ castor::CnvFactory<Converter>::CnvFactory() {
castor::Converters::instance()->addFactory(this); castor::Converters::instance()->addFactory(this);
} }
#endif // CASTOR_CNVFACTORY_HPP
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
* @author Sebastien Ponce * @author Sebastien Ponce
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_CONSTANTS_H #pragma once
#define CASTOR_CONSTANTS_H 1
#define C_ObjectsIds ObjectsIds #define C_ObjectsIds ObjectsIds
#define C_ServicesIds ServicesIds #define C_ServicesIds ServicesIds
...@@ -56,4 +55,3 @@ const char* C_RepresentationsIdsStrings(unsigned int type); ...@@ -56,4 +55,3 @@ const char* C_RepresentationsIdsStrings(unsigned int type);
#include "Constants.hpp" #include "Constants.hpp"
#endif /* CASTOR_CONSTANTS_H */
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
* @author Sebastien Ponce * @author Sebastien Ponce
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_CONSTANTS_HPP #pragma once
#define CASTOR_CONSTANTS_HPP 1
#ifdef __cplusplus #ifdef __cplusplus
namespace castor { namespace castor {
...@@ -334,4 +333,3 @@ namespace castor { ...@@ -334,4 +333,3 @@ namespace castor {
} /* end of namespace castor */ } /* end of namespace castor */
#endif #endif
#endif /* CASTOR_CONSTANTS_HPP */
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
* @author Sebastien Ponce * @author Sebastien Ponce
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_CONVERTERS_HPP #pragma once
#define CASTOR_CONVERTERS_HPP 1
//Include Files //Include Files
#include <map> #include <map>
...@@ -77,4 +76,3 @@ namespace castor { ...@@ -77,4 +76,3 @@ namespace castor {
} // end of namespace castor } // end of namespace castor
#endif // CASTOR_CONVERTERS_HPP
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
* @author Sebastien Ponce * @author Sebastien Ponce
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_FACTORIES_HPP #pragma once
#define CASTOR_FACTORIES_HPP 1
//Include Files //Include Files
#include <map> #include <map>
...@@ -76,4 +75,3 @@ namespace castor { ...@@ -76,4 +75,3 @@ namespace castor {
} // end of namespace castor } // end of namespace castor
#endif // CASTOR_FACTORIES_HPP
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
* @author Castor Dev team, castor-dev@cern.ch * @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_IADDRESS_HPP #pragma once
#define CASTOR_IADDRESS_HPP
// Include Files // Include Files
#include "castor/IObject.hpp" #include "castor/IObject.hpp"
...@@ -94,4 +93,3 @@ namespace castor { ...@@ -94,4 +93,3 @@ namespace castor {
} /* end of namespace castor */ } /* end of namespace castor */
#endif // CASTOR_IADDRESS_HPP
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
* @author Castor Dev team, castor-dev@cern.ch * @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_ICLIENT_HPP #pragma once
#define CASTOR_ICLIENT_HPP
// Include Files // Include Files
#include "castor/IObject.hpp" #include "castor/IObject.hpp"
...@@ -75,4 +74,3 @@ namespace castor { ...@@ -75,4 +74,3 @@ namespace castor {
} /* end of namespace castor */ } /* end of namespace castor */
#endif // CASTOR_ICLIENT_HPP
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
* @author Sebastien Ponce * @author Sebastien Ponce
*****************************************************************************/ *****************************************************************************/
#ifndef RH_CLIENTFACTORY_HPP #pragma once
#define RH_CLIENTFACTORY_HPP 1
// Include Files // Include Files
#include "castor/exception/Exception.hpp" #include "castor/exception/Exception.hpp"
...@@ -71,4 +70,3 @@ namespace castor { ...@@ -71,4 +70,3 @@ namespace castor {
} // end of namespace castor } // end of namespace castor
#endif // RH_CLIENTFACTORY_HPP
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
* @author Sebastien Ponce * @author Sebastien Ponce
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_ICNVFACTORY_HPP #pragma once
#define CASTOR_ICNVFACTORY_HPP 1
// Include Files // Include Files
#include "IFactory.hpp" #include "IFactory.hpp"
...@@ -72,4 +71,3 @@ namespace castor { ...@@ -72,4 +71,3 @@ namespace castor {
} // end of namespace castor } // end of namespace castor
#endif // CASTOR_ICNVFACTORY_HPP
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
* @author Sebastien Ponce * @author Sebastien Ponce
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_ICNVSVC_HPP #pragma once
#define CASTOR_ICNVSVC_HPP 1
// Include Files // Include Files
#include "castor/IService.hpp" #include "castor/IService.hpp"
...@@ -230,4 +229,3 @@ namespace castor { ...@@ -230,4 +229,3 @@ namespace castor {
} // end of namespace castor } // end of namespace castor
#endif // CASTOR_ICNVSVC_HPP
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
* @author Sebastien Ponce * @author Sebastien Ponce
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_ICONVERTER_HPP #pragma once
#define CASTOR_ICONVERTER_HPP 1
// Include Files // Include Files
#include <vector> #include <vector>
...@@ -197,4 +196,3 @@ namespace castor { ...@@ -197,4 +196,3 @@ namespace castor {
} // end of namespace castor } // end of namespace castor
#endif // CASTOR_ICONVERTER_HPP
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
* @author Sebastien Ponce * @author Sebastien Ponce
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_IFACTORY_HPP #pragma once
#define CASTOR_IFACTORY_HPP 1
// Include Files // Include Files
#include <string> #include <string>
...@@ -58,4 +57,3 @@ namespace castor { ...@@ -58,4 +57,3 @@ namespace castor {
} // end of namespace castor } // end of namespace castor
#endif // CASTOR_IFACTORY_HPP
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
* @author Castor Dev team, castor-dev@cern.ch * @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_IOBJECT_HPP #pragma once
#define CASTOR_IOBJECT_HPP
// Include Files // Include Files
#include "osdep.h" #include "osdep.h"
...@@ -98,4 +97,3 @@ namespace castor { ...@@ -98,4 +97,3 @@ namespace castor {
*/ */
std::ostream& operator<<(std::ostream& s, const castor::IObject& addr); std::ostream& operator<<(std::ostream& s, const castor::IObject& addr);
#endif // CASTOR_IOBJECT_HPP
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
* @author Sebastien Ponce * @author Sebastien Ponce
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_ISERVICE_HPP #pragma once
#define CASTOR_ISERVICE_HPP 1
// Include files // Include files
#include <string> #include <string>
...@@ -72,4 +71,3 @@ namespace castor { ...@@ -72,4 +71,3 @@ namespace castor {
} // end of namespace castor } // end of namespace castor
#endif // CASTOR_ISERVICE_HPP
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
* @author Sebastien Ponce * @author Sebastien Ponce
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_ISVCFACTORY_HPP #pragma once
#define CASTOR_ISVCFACTORY_HPP 1
// Include Files // Include Files
#include "IFactory.hpp" #include "IFactory.hpp"
...@@ -53,4 +52,3 @@ namespace castor { ...@@ -53,4 +52,3 @@ namespace castor {
} // end of namespace castor } // end of namespace castor
#endif // CASTOR_ISVCFACTORY_HPP
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
* @author Castor Dev team, castor-dev@cern.ch * @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/ *****************************************************************************/
#ifndef CASTOR_MESSAGEACK_HPP #pragma once
#define CASTOR_MESSAGEACK_HPP
// Include Files // Include Files
#include "castor/IObject.hpp" #include "castor/IObject.hpp"
...@@ -202,4 +201,3 @@ namespace castor { ...@@ -202,4 +201,3 @@ namespace castor {
} /* end of namespace castor */ } /* end of namespace castor */
#endif // CASTOR_MESSAGEACK_HPP
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment