diff options
Diffstat (limited to 'src/lib/util')
34 files changed, 97 insertions, 97 deletions
diff --git a/src/lib/util/buffer.h b/src/lib/util/buffer.h index 7e881089cd..4800e9905d 100644 --- a/src/lib/util/buffer.h +++ b/src/lib/util/buffer.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __BUFFER_H -#define __BUFFER_H 1 +#ifndef BUFFER_H +#define BUFFER_H 1 #include <stdlib.h> #include <cstring> @@ -535,7 +535,7 @@ typedef boost::shared_ptr<OutputBuffer> OutputBufferPtr; } // namespace util } // namespace isc -#endif // __BUFFER_H +#endif // BUFFER_H // Local Variables: // mode: c++ diff --git a/src/lib/util/encode/base32hex.h b/src/lib/util/encode/base32hex.h index d7129d74a6..83fd0d33da 100644 --- a/src/lib/util/encode/base32hex.h +++ b/src/lib/util/encode/base32hex.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __BASE32HEX_H -#define __BASE32HEX_H 1 +#ifndef BASE32HEX_H +#define BASE32HEX_H 1 #include <stdint.h> #include <string> @@ -57,7 +57,7 @@ void decodeBase32Hex(const std::string& input, std::vector<uint8_t>& result); } // namespace util } // namespace isc -#endif // __BASE32HEX_H +#endif // BASE32HEX_H // Local Variables: // mode: c++ diff --git a/src/lib/util/encode/base64.h b/src/lib/util/encode/base64.h index 6b1b346584..1c7c74d988 100644 --- a/src/lib/util/encode/base64.h +++ b/src/lib/util/encode/base64.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __BASE64_H -#define __BASE64_H 1 +#ifndef BASE64_H +#define BASE64_H 1 #include <stdint.h> #include <string> @@ -72,7 +72,7 @@ void decodeBase64(const std::string& input, std::vector<uint8_t>& result); } // namespace util } // namespace isc -#endif // __BASE64_H +#endif // BASE64_H // Local Variables: // mode: c++ diff --git a/src/lib/util/encode/hex.h b/src/lib/util/encode/hex.h index 5c806fcfaa..32b5071257 100644 --- a/src/lib/util/encode/hex.h +++ b/src/lib/util/encode/hex.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __HEX_H -#define __HEX_H 1 +#ifndef HEX_H +#define HEX_H 1 #include <stdint.h> #include <string> @@ -58,7 +58,7 @@ void decodeHex(const std::string& input, std::vector<uint8_t>& result); } // namespace util } // namespace isc -#endif // __HEX_H +#endif // HEX_H // Local Variables: // mode: c++ diff --git a/src/lib/util/filename.h b/src/lib/util/filename.h index f6259386ef..a4ba47c46f 100644 --- a/src/lib/util/filename.h +++ b/src/lib/util/filename.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __FILENAME_H -#define __FILENAME_H +#ifndef FILENAME_H +#define FILENAME_H #include <string> @@ -170,4 +170,4 @@ private: } // namespace util } // namespace isc -#endif // __FILENAME_H +#endif // FILENAME_H diff --git a/src/lib/util/hash/sha1.h b/src/lib/util/hash/sha1.h index 6089ca8eae..165d93f85a 100644 --- a/src/lib/util/hash/sha1.h +++ b/src/lib/util/hash/sha1.h @@ -30,8 +30,8 @@ * without express or implied warranty of any kind. */ -#ifndef _SHA1_H_ -#define _SHA1_H_ +#ifndef SHA1_H +#define SHA1_H #include <stdint.h> diff --git a/src/lib/util/interprocess_sync.h b/src/lib/util/interprocess_sync.h index e4fa7afcfe..f55f0ac5ca 100644 --- a/src/lib/util/interprocess_sync.h +++ b/src/lib/util/interprocess_sync.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __INTERPROCESS_SYNC_H__ -#define __INTERPROCESS_SYNC_H__ +#ifndef INTERPROCESS_SYNC_H +#define INTERPROCESS_SYNC_H #include <string> @@ -146,4 +146,4 @@ protected: } // namespace util } // namespace isc -#endif // __INTERPROCESS_SYNC_H__ +#endif // INTERPROCESS_SYNC_H diff --git a/src/lib/util/interprocess_sync_file.h b/src/lib/util/interprocess_sync_file.h index fd8da1b438..153b39164f 100644 --- a/src/lib/util/interprocess_sync_file.h +++ b/src/lib/util/interprocess_sync_file.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __INTERPROCESS_SYNC_FILE_H__ -#define __INTERPROCESS_SYNC_FILE_H__ +#ifndef INTERPROCESS_SYNC_FILE_H +#define INTERPROCESS_SYNC_FILE_H #include <util/interprocess_sync.h> #include <exceptions/exceptions.h> @@ -88,4 +88,4 @@ private: } // namespace util } // namespace isc -#endif // __INTERPROCESS_SYNC_FILE_H__ +#endif // INTERPROCESS_SYNC_FILE_H diff --git a/src/lib/util/interprocess_sync_null.h b/src/lib/util/interprocess_sync_null.h index 6ac032245e..be775148e0 100644 --- a/src/lib/util/interprocess_sync_null.h +++ b/src/lib/util/interprocess_sync_null.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __INTERPROCESS_SYNC_NULL_H__ -#define __INTERPROCESS_SYNC_NULL_H__ +#ifndef INTERPROCESS_SYNC_NULL_H +#define INTERPROCESS_SYNC_NULL_H #include <util/interprocess_sync.h> @@ -61,4 +61,4 @@ protected: } // namespace util } // namespace isc -#endif // __INTERPROCESS_SYNC_NULL_H__ +#endif // INTERPROCESS_SYNC_NULL_H diff --git a/src/lib/util/io/fd.h b/src/lib/util/io/fd.h index bdd2d41f58..e90e16e790 100644 --- a/src/lib/util/io/fd.h +++ b/src/lib/util/io/fd.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __UTIL_IO_FD_H -#define __UTIL_IO_FD_H 1 +#ifndef UTIL_IO_FD_H +#define UTIL_IO_FD_H 1 #include <unistd.h> @@ -58,4 +58,4 @@ read_data(const int fd, void *buffer, const size_t length); } } -#endif // __UTIL_IO_FD_H +#endif // UTIL_IO_FD_H diff --git a/src/lib/util/io/pktinfo_utilities.h b/src/lib/util/io/pktinfo_utilities.h index 9883c30855..74dc37d3df 100644 --- a/src/lib/util/io/pktinfo_utilities.h +++ b/src/lib/util/io/pktinfo_utilities.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __PKTINFO_UTIL_H_ -#define __PKTINFO_UTIL_H_ 1 +#ifndef PKTINFO_UTIL_H +#define PKTINFO_UTIL_H 1 #include <sys/socket.h> #include <netinet/in.h> @@ -48,4 +48,4 @@ convertPktInfo6(unsigned char* pktinfo) { } } -#endif // __PKTINFO_UTIL_H_ +#endif // PKTINFO_UTIL_H diff --git a/src/lib/util/io/sockaddr_util.h b/src/lib/util/io/sockaddr_util.h index 0cd7c7b10d..847a0cb946 100644 --- a/src/lib/util/io/sockaddr_util.h +++ b/src/lib/util/io/sockaddr_util.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __SOCKADDR_UTIL_H_ -#define __SOCKADDR_UTIL_H_ 1 +#ifndef SOCKADDR_UTIL_H +#define SOCKADDR_UTIL_H 1 #include <sys/types.h> #include <sys/socket.h> @@ -77,7 +77,7 @@ convertSockAddr(struct sockaddr* sa) { } } -#endif // __SOCKADDR_UTIL_H_ +#endif // SOCKADDR_UTIL_H // Local Variables: // mode: c++ diff --git a/src/lib/util/io/socketsession.h b/src/lib/util/io/socketsession.h index 48b7f19fe0..023ef8eb2f 100644 --- a/src/lib/util/io/socketsession.h +++ b/src/lib/util/io/socketsession.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __SOCKETSESSION_H_ -#define __SOCKETSESSION_H_ 1 +#ifndef SOCKETSESSION_H +#define SOCKETSESSION_H 1 #include <boost/noncopyable.hpp> @@ -492,7 +492,7 @@ private: } } -#endif // __SOCKETSESSION_H_ +#endif // SOCKETSESSION_H // Local Variables: // mode: c++ diff --git a/src/lib/util/io_utilities.h b/src/lib/util/io_utilities.h index 61d4c9c94b..66b9a4e7ea 100644 --- a/src/lib/util/io_utilities.h +++ b/src/lib/util/io_utilities.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __IO_UTILITIES_H -#define __IO_UTILITIES_H +#ifndef IO_UTILITIES_H +#define IO_UTILITIES_H #include <cstddef> diff --git a/src/lib/util/locks.h b/src/lib/util/locks.h index f33ff960e3..34296f2a9d 100644 --- a/src/lib/util/locks.h +++ b/src/lib/util/locks.h @@ -23,8 +23,8 @@ /// to be set. we might want to enfore this at compile time with a check /// (TODO) -#ifndef __LOCKS_ -#define __LOCKS_ +#ifndef LOCKS +#define LOCKS namespace isc { namespace util { @@ -62,4 +62,4 @@ public: } // namespace util } // namespace isc -#endif // __LOCKS_ +#endif // LOCKS diff --git a/src/lib/util/lru_list.h b/src/lib/util/lru_list.h index 797c3c9170..e5db8699f5 100644 --- a/src/lib/util/lru_list.h +++ b/src/lib/util/lru_list.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __LRU_LIST_H -#define __LRU_LIST_H +#ifndef LRU_LIST_H +#define LRU_LIST_H #include <list> #include <string> @@ -257,4 +257,4 @@ void LruList<T>::clear() { } // namespace util } // namespace isc -#endif // __LRU_LIST_H +#endif // LRU_LIST_H diff --git a/src/lib/util/memory_segment.h b/src/lib/util/memory_segment.h index 97d2e024a8..664bd3c644 100644 --- a/src/lib/util/memory_segment.h +++ b/src/lib/util/memory_segment.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __MEMORY_SEGMENT_H__ -#define __MEMORY_SEGMENT_H__ +#ifndef MEMORY_SEGMENT_H +#define MEMORY_SEGMENT_H #include <stdlib.h> @@ -66,4 +66,4 @@ public: } // namespace util } // namespace isc -#endif // __MEMORY_SEGMENT_H__ +#endif // MEMORY_SEGMENT_H diff --git a/src/lib/util/memory_segment_local.h b/src/lib/util/memory_segment_local.h index 5e43e530f6..de35b87db1 100644 --- a/src/lib/util/memory_segment_local.h +++ b/src/lib/util/memory_segment_local.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __MEMORY_SEGMENT_LOCAL_H__ -#define __MEMORY_SEGMENT_LOCAL_H__ +#ifndef MEMORY_SEGMENT_LOCAL_H +#define MEMORY_SEGMENT_LOCAL_H #include <util/memory_segment.h> @@ -73,4 +73,4 @@ private: } // namespace util } // namespace isc -#endif // __MEMORY_SEGMENT_LOCAL_H__ +#endif // MEMORY_SEGMENT_LOCAL_H diff --git a/src/lib/util/python/pycppwrapper_util.h b/src/lib/util/python/pycppwrapper_util.h index 462e7150cb..31041baa3e 100644 --- a/src/lib/util/python/pycppwrapper_util.h +++ b/src/lib/util/python/pycppwrapper_util.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __PYCPPWRAPPER_UTIL_H -#define __PYCPPWRAPPER_UTIL_H 1 +#ifndef PYCPPWRAPPER_UTIL_H +#define PYCPPWRAPPER_UTIL_H 1 #include <Python.h> @@ -328,7 +328,7 @@ installClassVariable(PyTypeObject& pyclass, const char* name, PyObject* obj) { } // namespace python } // namespace util } // namespace isc -#endif // __PYCPPWRAPPER_UTIL_H +#endif // PYCPPWRAPPER_UTIL_H // Local Variables: // mode: c++ diff --git a/src/lib/util/python/wrapper_template.h b/src/lib/util/python/wrapper_template.h index be701e1b01..787a2969e2 100644 --- a/src/lib/util/python/wrapper_template.h +++ b/src/lib/util/python/wrapper_template.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __PYTHON_@CPPCLASS@_H -#define __PYTHON_@CPPCLASS@_H 1 +#ifndef PYTHON_@CPPCLASS@_H +#define PYTHON_@CPPCLASS@_H 1 #include <Python.h> @@ -52,7 +52,7 @@ PyObject* create@CPPCLASS@Object(const @CPPCLASS@& source); } // namespace python } // namespace @MODULE@ } // namespace isc -#endif // __PYTHON_@CPPCLASS@_H +#endif // PYTHON_@CPPCLASS@_H // Local Variables: // mode: c++ diff --git a/src/lib/util/random/qid_gen.h b/src/lib/util/random/qid_gen.h index 1af43c1fad..80f532fc71 100644 --- a/src/lib/util/random/qid_gen.h +++ b/src/lib/util/random/qid_gen.h @@ -18,8 +18,8 @@ // (and other parts where we need randomness, perhaps another thing // for a general libutil?) -#ifndef __QID_GEN_H -#define __QID_GEN_H +#ifndef QID_GEN_H +#define QID_GEN_H #include <boost/random/mersenne_twister.hpp> #include <boost/random/uniform_int.hpp> @@ -84,4 +84,4 @@ private: } // namespace util } // namespace isc -#endif // __QID_GEN_H +#endif // QID_GEN_H diff --git a/src/lib/util/random/random_number_generator.h b/src/lib/util/random/random_number_generator.h index 485ea7a2e5..f0c0fb30d0 100644 --- a/src/lib/util/random/random_number_generator.h +++ b/src/lib/util/random/random_number_generator.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __NSAS_RANDOM_NUMBER_GENERATOR_H -#define __NSAS_RANDOM_NUMBER_GENERATOR_H +#ifndef NSAS_RANDOM_NUMBER_GENERATOR_H +#define NSAS_RANDOM_NUMBER_GENERATOR_H #include <algorithm> #include <cmath> @@ -205,4 +205,4 @@ private: } // namespace util } // namespace isc -#endif//__NSAS_RANDOM_NUMBER_GENERATOR_H +#endif//NSAS_RANDOM_NUMBER_GENERATOR_H diff --git a/src/lib/util/range_utilities.h b/src/lib/util/range_utilities.h index 3f8b971b2d..f9ca48f877 100644 --- a/src/lib/util/range_utilities.h +++ b/src/lib/util/range_utilities.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __RANGE_UTIL_H_ -#define __RANGE_UTIL_H_ 1 +#ifndef RANGE_UTIL_H +#define RANGE_UTIL_H 1 #include <stdlib.h> #include <algorithm> diff --git a/src/lib/util/strutil.h b/src/lib/util/strutil.h index 0dbbe96b04..6b60009f9b 100644 --- a/src/lib/util/strutil.h +++ b/src/lib/util/strutil.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __STRUTIL_H -#define __STRUTIL_H +#ifndef STRUTIL_H +#define STRUTIL_H #include <algorithm> #include <cctype> @@ -206,4 +206,4 @@ tokenToNum(const std::string& num_token) { } // namespace util } // namespace isc -#endif // __STRUTIL_H +#endif // STRUTIL_H diff --git a/src/lib/util/time_utilities.h b/src/lib/util/time_utilities.h index a53089d577..5427640463 100644 --- a/src/lib/util/time_utilities.h +++ b/src/lib/util/time_utilities.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __TIME_UTILITIES_H -#define __TIME_UTILITIES_H 1 +#ifndef TIME_UTILITIES_H +#define TIME_UTILITIES_H 1 #include <string> diff --git a/src/lib/util/unittests/check_valgrind.h b/src/lib/util/unittests/check_valgrind.h index c08b58bc10..80f1f859d1 100644 --- a/src/lib/util/unittests/check_valgrind.h +++ b/src/lib/util/unittests/check_valgrind.h @@ -27,8 +27,8 @@ // natively // -#ifndef __UTIL_UNITTESTS_CHECK_VALGRIND_H -#define __UTIL_UNITTESTS_CHECK_VALGRIND_H 1 +#ifndef UTIL_UNITTESTS_CHECK_VALGRIND_H +#define UTIL_UNITTESTS_CHECK_VALGRIND_H 1 #include <config.h> @@ -47,4 +47,4 @@ bool runningOnValgrind(); } // end namespace util } // end namespace isc -#endif // __UTIL_UNITTESTS_CHECK_VALGRIND_H +#endif // UTIL_UNITTESTS_CHECK_VALGRIND_H diff --git a/src/lib/util/unittests/fork.h b/src/lib/util/unittests/fork.h index 2d27a115cf..d5623a758a 100644 --- a/src/lib/util/unittests/fork.h +++ b/src/lib/util/unittests/fork.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __UTIL_UNITTESTS_FORK_H -#define __UTIL_UNITTESTS_FORK_H 1 +#ifndef UTIL_UNITTESTS_FORK_H +#define UTIL_UNITTESTS_FORK_H 1 #include <unistd.h> @@ -49,4 +49,4 @@ check_output(int *write_pipe, const void *output, const size_t length); } } -#endif // __UTIL_UNITTESTS_FORK_H +#endif // UTIL_UNITTESTS_FORK_H diff --git a/src/lib/util/unittests/mock_socketsession.h b/src/lib/util/unittests/mock_socketsession.h index 8078265deb..01ca34f3e6 100644 --- a/src/lib/util/unittests/mock_socketsession.h +++ b/src/lib/util/unittests/mock_socketsession.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __UTIL_UNITTESTS_MOCKSOCKETSESSION_H -#define __UTIL_UNITTESTS_MOCKSOCKETSESSION_H 1 +#ifndef UTIL_UNITTESTS_MOCKSOCKETSESSION_H +#define UTIL_UNITTESTS_MOCKSOCKETSESSION_H 1 #include <exceptions/exceptions.h> @@ -147,7 +147,7 @@ private: } // end of unittests } // end of util } // end of isc -#endif // __UTIL_UNITTESTS_MOCKSOCKETSESSION_H +#endif // UTIL_UNITTESTS_MOCKSOCKETSESSION_H // Local Variables: // mode: c++ diff --git a/src/lib/util/unittests/newhook.h b/src/lib/util/unittests/newhook.h index c90751eb7f..d2c1385ffe 100644 --- a/src/lib/util/unittests/newhook.h +++ b/src/lib/util/unittests/newhook.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __UTIL_UNITTESTS_NEWHOOK_H -#define __UTIL_UNITTESTS_NEWHOOK_H 1 +#ifndef UTIL_UNITTESTS_NEWHOOK_H +#define UTIL_UNITTESTS_NEWHOOK_H 1 /** * \file newhook.h @@ -75,7 +75,7 @@ extern size_t throw_size_on_new; } } -#endif // __UTIL_UNITTESTS_NEWHOOK_H +#endif // UTIL_UNITTESTS_NEWHOOK_H // Local Variables: // mode: c++ diff --git a/src/lib/util/unittests/resource.h b/src/lib/util/unittests/resource.h index 6430ab2bc1..42dad87649 100644 --- a/src/lib/util/unittests/resource.h +++ b/src/lib/util/unittests/resource.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __UTIL_UNITTESTS_RESOURCE_H -#define __UTIL_UNITTESTS_RESOURCE_H 1 +#ifndef UTIL_UNITTESTS_RESOURCE_H +#define UTIL_UNITTESTS_RESOURCE_H 1 namespace isc { namespace util { diff --git a/src/lib/util/unittests/run_all.h b/src/lib/util/unittests/run_all.h index 94c7cb0365..2335df71dc 100644 --- a/src/lib/util/unittests/run_all.h +++ b/src/lib/util/unittests/run_all.h @@ -14,8 +14,8 @@ -#ifndef __RUN_ALL_H -#define __RUN_ALL_H +#ifndef RUN_ALL_H +#define RUN_ALL_H // Avoid need for user to include this header file. @@ -49,4 +49,4 @@ int run_all(); -#endif // __RUN_ALL_H +#endif // RUN_ALL_H diff --git a/src/lib/util/unittests/testdata.h b/src/lib/util/unittests/testdata.h index a452dc69d5..c7ee707970 100644 --- a/src/lib/util/unittests/testdata.h +++ b/src/lib/util/unittests/testdata.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __UTIL_UNITTESTS_TESTDATA_H -#define __UTIL_UNITTESTS_TESTDATA_H 1 +#ifndef UTIL_UNITTESTS_TESTDATA_H +#define UTIL_UNITTESTS_TESTDATA_H 1 /** * \file testdata.h @@ -47,7 +47,7 @@ void openTestData(const char* const datafile, std::ifstream& ifs); } } -#endif // __UTIL_UNITTESTS_TESTDATA_H +#endif // UTIL_UNITTESTS_TESTDATA_H // Local Variables: // mode: c++ diff --git a/src/lib/util/unittests/textdata.h b/src/lib/util/unittests/textdata.h index 3e5fe0f2f7..50d09ea6c6 100644 --- a/src/lib/util/unittests/textdata.h +++ b/src/lib/util/unittests/textdata.h @@ -18,8 +18,8 @@ #include <gtest/gtest.h> -#ifndef __UTIL_UNITTESTS_TEXTDATA_H -#define __UTIL_UNITTESTS_TEXTDATA_H 1 +#ifndef UTIL_UNITTESTS_TEXTDATA_H +#define UTIL_UNITTESTS_TEXTDATA_H 1 /** * \file textdata.h @@ -96,7 +96,7 @@ matchTextData(const std::string& expected_text, } } -#endif // __UTIL_UNITTESTS_TEXTDATA_H +#endif // UTIL_UNITTESTS_TEXTDATA_H // Local Variables: // mode: c++ diff --git a/src/lib/util/unittests/wiredata.h b/src/lib/util/unittests/wiredata.h index a33a03af97..a8c519ea16 100644 --- a/src/lib/util/unittests/wiredata.h +++ b/src/lib/util/unittests/wiredata.h @@ -12,8 +12,8 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. -#ifndef __UTIL_UNITTESTS_WIREDATA_H -#define __UTIL_UNITTESTS_WIREDATA_H 1 +#ifndef UTIL_UNITTESTS_WIREDATA_H +#define UTIL_UNITTESTS_WIREDATA_H 1 #include <cstddef> @@ -38,7 +38,7 @@ void matchWireData(const void* expected_data, std::size_t expected_len, } } -#endif // __UTIL_UNITTESTS_WIREDATA_H +#endif // UTIL_UNITTESTS_WIREDATA_H // Local Variables: // mode: c++ |