From 3e4bff1a7e8e2d1f1ecb0f04440946b5eb78a591 Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Thu, 6 Nov 2008 19:50:06 -0200 Subject: [PATCH 1/1] Fix indentation Don't use spaces for indentation, use tabs instead. --- src/basic_buffer.hpp | 2 +- src/error.hpp | 4 ++-- src/socket/basic_socket.hpp | 48 ++++++++++++++++++------------------- test/Makefile | 4 ++-- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/basic_buffer.hpp b/src/basic_buffer.hpp index 494043f..8180db8 100644 --- a/src/basic_buffer.hpp +++ b/src/basic_buffer.hpp @@ -403,7 +403,7 @@ struct basic_buffer { } /** - * Efficiently swaps the contents of x and y. + * Efficiently swaps the contents of x and y. * * Invalidates all references and iterators. */ diff --git a/src/error.hpp b/src/error.hpp index 89ac576..acea422 100644 --- a/src/error.hpp +++ b/src/error.hpp @@ -37,13 +37,13 @@ struct error: std::runtime_error inline posixx::error::error() throw(): - std::runtime_error(strerror(errno)), no(errno) + std::runtime_error(strerror(errno)), no(errno) { } inline posixx::error::error(const std::string& where) throw (): - std::runtime_error(where + ": " + strerror(errno)), no(errno) + std::runtime_error(where + ": " + strerror(errno)), no(errno) { } diff --git a/src/socket/basic_socket.hpp b/src/socket/basic_socket.hpp index 3f6f779..9135f52 100644 --- a/src/socket/basic_socket.hpp +++ b/src/socket/basic_socket.hpp @@ -600,30 +600,30 @@ ssize_t posixx::socket::basic_socket< TSockTraits >::recv(void* buf, size_t n, } /* - template< typename TSockTraits > - inline - ssize_t posixx::socket::basic_socket< TSockTraits >::send(const msghdr* msg, int flags) - { - ssize_t s = ::sendmsg(_fd, msg, flags); - if (s == -1) - throw error("sendmsg"); - if (s == 0) - throw error("send"); - return s; - } - - template< typename TSockTraits > - inline - ssize_t posixx::socket::basic_socket< TSockTraits >::recv(struct msghdr* msg, int flags) - { - ssize_t s = ::recvmsg(_fd, msg, flags); - if (s == -1) - throw error("recvmsg"); - if (s == 0) - throw error("send"); - return s; - } - */ +template< typename TSockTraits > +inline +ssize_t posixx::socket::basic_socket< TSockTraits >::send(const msghdr* msg, int flags) +{ + ssize_t s = ::sendmsg(_fd, msg, flags); + if (s == -1) + throw error("sendmsg"); + if (s == 0) + throw error("send"); + return s; +} + +template< typename TSockTraits > +inline +ssize_t posixx::socket::basic_socket< TSockTraits >::recv(struct msghdr* msg, int flags) +{ + ssize_t s = ::recvmsg(_fd, msg, flags); + if (s == -1) + throw error("recvmsg"); + if (s == 0) + throw error("send"); + return s; +} +*/ template< typename TSockTraits > template< typename TSockOpt > diff --git a/test/Makefile b/test/Makefile index c6f2a22..9e9ad9f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -4,8 +4,8 @@ LOCAL_LDFLAGS = -lboost_unit_test_framework TESTPRG = test_suite TESTCMD = ./$(TESTPRG) --detect_memory_leak=1 --report_level=short \ -# --build_info=yes --log_level=test_suite \ -# | grep -v "Entering test case " | grep -v "Leaving test case" + #--build_info=yes --log_level=test_suite \ + #| grep -v "Entering test case " | grep -v "Leaving test case" VALGRIND = valgrind --tool=memcheck --leak-check=yes --db-attach=no \ --num-callers=24 --leak-resolution=high --track-fds=yes \ -- 2.43.0