From ddfc1b38d7bb5cc607afc7fadc6374911f5a9e60 Mon Sep 17 00:00:00 2001 From: Markus Grüneis Date: Wed, 17 Feb 2010 21:40:54 +0000 Subject: whitespace only change: unified formatting with "astyle --style=k/r --indent=spaces=2 --unpad-paren --add-brackets --align-pointer=type --keep-one-line-blocks --indent-col1-comments --lineend=linux --suffix=none --recursive" --- src/options.h | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'src/options.h') diff --git a/src/options.h b/src/options.h index 7a58c58..02b0c1b 100644 --- a/src/options.h +++ b/src/options.h @@ -11,7 +11,7 @@ * tunneling and relaying of packets of any protocol. * * - * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, + * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, * Christian Pointner * * This file is part of Anytun. @@ -56,7 +56,7 @@ public: void init(std::string addrPort); std::string addr; - std::string port; + std::string port; }; typedef std::list HostList; std::istream& operator>>(std::istream& stream, OptionHost& host); @@ -131,7 +131,7 @@ public: Options& setLocalSyncAddr(std::string l); std::string getLocalSyncPort(); Options& setLocalSyncPort(std::string l); - HostList getRemoteSyncHosts(); + HostList getRemoteSyncHosts(); std::string getDevName(); Options& setDevName(std::string d); @@ -171,15 +171,18 @@ public: private: Options(); ~Options(); - Options(const Options &l); - void operator=(const Options &l); + Options(const Options& l); + void operator=(const Options& l); static Options* inst; static ::Mutex instMutex; - class instanceCleaner { - public: ~instanceCleaner() { - if(Options::inst != 0) + class instanceCleaner + { + public: + ~instanceCleaner() { + if(Options::inst != 0) { delete Options::inst; + } } }; friend class instanceCleaner; @@ -208,7 +211,7 @@ private: OptionHost remote_; OptionHost local_sync_; - HostList remote_sync_hosts_; + HostList remote_sync_hosts_; std::string dev_name_; std::string dev_type_; -- cgit v1.2.3