From cf8a7c061807bd1af8221f2d8ce5fe2a83c40f94 Mon Sep 17 00:00:00 2001 From: Marian Krivos Date: Mon, 22 Aug 2011 18:26:20 +0000 Subject: [PATCH] trunk/branch integration: source indentation --- .../include/Poco/UniqueAccessExpireCache.h | 9 +++---- .../include/Poco/UniqueAccessExpireLRUCache.h | 8 +++---- .../include/Poco/UniqueAccessExpireStrategy.h | 24 +++++++++---------- Foundation/include/Poco/UniqueExpireCache.h | 10 ++++---- .../include/Poco/UniqueExpireLRUCache.h | 10 ++++---- .../include/Poco/UniqueExpireStrategy.h | 8 +++---- Foundation/include/Poco/ValidArgs.h | 8 +++---- 7 files changed, 39 insertions(+), 38 deletions(-) diff --git a/Foundation/include/Poco/UniqueAccessExpireCache.h b/Foundation/include/Poco/UniqueAccessExpireCache.h index dfd5add95..6f9b732ba 100644 --- a/Foundation/include/Poco/UniqueAccessExpireCache.h +++ b/Foundation/include/Poco/UniqueAccessExpireCache.h @@ -36,8 +36,8 @@ // -#ifndef Foundation_UniqueAccessExpireCache_INCLUDED -#define Foundation_UniqueAccessExpireCache_INCLUDED +#ifndef Foundation_UniqueAccessExpireCache_INCLUDED +#define Foundation_UniqueAccessExpireCache_INCLUDED #include "Poco/AbstractCache.h" @@ -53,7 +53,7 @@ template < class TMutex = FastMutex, class TEventMutex = FastMutex > -class UniqueAccessExpireCache: public AbstractCache, TMutex, TEventMutex > +class UniqueAccessExpireCache: public AbstractCache, TMutex, TEventMutex> /// An UniqueAccessExpireCache caches entries for a given time span. In contrast /// to ExpireCache which only allows to set a per cache expiration value, it allows to define /// expiration per CacheEntry. @@ -91,4 +91,5 @@ private: } // namespace Poco -#endif + +#endif // Foundation_UniqueAccessExpireCache_INCLUDED diff --git a/Foundation/include/Poco/UniqueAccessExpireLRUCache.h b/Foundation/include/Poco/UniqueAccessExpireLRUCache.h index df3e072f2..da1e5c1d4 100644 --- a/Foundation/include/Poco/UniqueAccessExpireLRUCache.h +++ b/Foundation/include/Poco/UniqueAccessExpireLRUCache.h @@ -1,7 +1,7 @@ // // UniqueAccessExpireLRUCache.h // -// $Id: //poco/svn/Foundation/include/Poco/UniqueAccessExpireLRUCache.h#2 $ +// $Id: //poco/1.4/Foundation/include/Poco/UniqueAccessExpireLRUCache.h#1 $ // // Library: Foundation // Package: Cache @@ -36,8 +36,8 @@ // -#ifndef Foundation_UniqueAccessExpireLRUCache_INCLUDED -#define Foundation_UniqueAccessExpireLRUCache_INCLUDED +#ifndef Foundation_UniqueAccessExpireLRUCache_INCLUDED +#define Foundation_UniqueAccessExpireLRUCache_INCLUDED #include "Poco/AbstractCache.h" @@ -55,7 +55,7 @@ template < class TMutex = FastMutex, class TEventMutex = FastMutex > -class UniqueAccessExpireLRUCache: public AbstractCache, TMutex, TEventMutex > +class UniqueAccessExpireLRUCache: public AbstractCache, TMutex, TEventMutex> /// A UniqueAccessExpireLRUCache combines LRU caching and time based per entry expire caching. /// One can define for each cache entry a seperate timepoint /// but also limit the size of the cache (per default: 1024). diff --git a/Foundation/include/Poco/UniqueAccessExpireStrategy.h b/Foundation/include/Poco/UniqueAccessExpireStrategy.h index 2acb53c61..20a2c35c9 100644 --- a/Foundation/include/Poco/UniqueAccessExpireStrategy.h +++ b/Foundation/include/Poco/UniqueAccessExpireStrategy.h @@ -1,7 +1,7 @@ // // UniqueAccessExpireStrategy.h // -// $Id: //poco/svn/Foundation/include/Poco/UniqueAccessExpireStrategy.h#3 $ +// $Id: //poco/1.4/Foundation/include/Poco/UniqueAccessExpireStrategy.h#1 $ // // Library: Foundation // Package: Cache @@ -36,8 +36,9 @@ // -#ifndef Foundation_UniqueAccessExpireStrategy_INCLUDED -#define Foundation_UniqueAccessExpireStrategy_INCLUDED +#ifndef Foundation_UniqueAccessExpireStrategy_INCLUDED +#define Foundation_UniqueAccessExpireStrategy_INCLUDED + #include "Poco/KeyValueArgs.h" #include "Poco/ValidArgs.h" @@ -49,13 +50,11 @@ #include "Poco/UniqueExpireStrategy.h" #include #include -#include namespace Poco { - template < class TKey, class TValue @@ -71,12 +70,12 @@ class UniqueAccessExpireStrategy: public AbstractStrategy /// which returns the timespan for how long an object will be valid without being accessed. { public: - typedef std::pair KeyExpire; - typedef std::multimap TimeIndex; - typedef typename TimeIndex::iterator IndexIterator; - typedef typename TimeIndex::const_iterator ConstIndexIterator; - typedef std::map Keys; - typedef typename Keys::iterator Iterator; + typedef std::pair KeyExpire; + typedef std::multimap TimeIndex; + typedef typename TimeIndex::iterator IndexIterator; + typedef typename TimeIndex::const_iterator ConstIndexIterator; + typedef std::map Keys; + typedef typename Keys::iterator Iterator; public: UniqueAccessExpireStrategy() @@ -175,4 +174,5 @@ protected: } // namespace Poco -#endif + +#endif // Foundation_UniqueAccessExpireStrategy_INCLUDED diff --git a/Foundation/include/Poco/UniqueExpireCache.h b/Foundation/include/Poco/UniqueExpireCache.h index cf989e7ff..b0c8441c3 100644 --- a/Foundation/include/Poco/UniqueExpireCache.h +++ b/Foundation/include/Poco/UniqueExpireCache.h @@ -1,7 +1,7 @@ // // UniqueExpireCache.h // -// $Id: //poco/svn/Foundation/include/Poco/UniqueExpireCache.h#2 $ +// $Id: //poco/1.4/Foundation/include/Poco/UniqueExpireCache.h#1 $ // // Library: Foundation // Package: Cache @@ -36,8 +36,8 @@ // -#ifndef Foundation_UniqueExpireCache_INCLUDED -#define Foundation_UniqueExpireCache_INCLUDED +#ifndef Foundation_UniqueExpireCache_INCLUDED +#define Foundation_UniqueExpireCache_INCLUDED #include "Poco/AbstractCache.h" @@ -53,7 +53,7 @@ template < class TMutex = FastMutex, class TEventMutex = FastMutex > -class UniqueExpireCache: public AbstractCache, TMutex, TEventMutex > +class UniqueExpireCache: public AbstractCache, TMutex, TEventMutex> /// An UniqueExpireCache caches entries for a given time amount. In contrast /// to ExpireCache which only allows to set a per cache expiration value, it allows to define /// expiration per CacheEntry. @@ -91,4 +91,4 @@ private: } // namespace Poco -#endif +#endif // Foundation_UniqueExpireCache_INCLUDED diff --git a/Foundation/include/Poco/UniqueExpireLRUCache.h b/Foundation/include/Poco/UniqueExpireLRUCache.h index f0d07562e..fd55822db 100644 --- a/Foundation/include/Poco/UniqueExpireLRUCache.h +++ b/Foundation/include/Poco/UniqueExpireLRUCache.h @@ -1,7 +1,7 @@ // // UniqueExpireLRUCache.h // -// $Id: //poco/svn/Foundation/include/Poco/UniqueExpireLRUCache.h#2 $ +// $Id: //poco/1.4/Foundation/include/Poco/UniqueExpireLRUCache.h#1 $ // // Library: Foundation // Package: Cache @@ -36,8 +36,8 @@ // -#ifndef Foundation_UniqueExpireLRUCache_INCLUDED -#define Foundation_UniqueExpireLRUCache_INCLUDED +#ifndef Foundation_UniqueExpireLRUCache_INCLUDED +#define Foundation_UniqueExpireLRUCache_INCLUDED #include "Poco/AbstractCache.h" @@ -55,7 +55,7 @@ template < class TMutex = FastMutex, class TEventMutex = FastMutex > -class UniqueExpireLRUCache: public AbstractCache, TMutex, TEventMutex > +class UniqueExpireLRUCache: public AbstractCache, TMutex, TEventMutex> /// A UniqueExpireLRUCache combines LRU caching and time based per entry expire caching. /// One can define for each cache entry a seperate timepoint /// but also limit the size of the cache (per default: 1024). @@ -89,4 +89,4 @@ private: } // namespace Poco -#endif +#endif // Foundation_UniqueExpireLRUCache_INCLUDED diff --git a/Foundation/include/Poco/UniqueExpireStrategy.h b/Foundation/include/Poco/UniqueExpireStrategy.h index 137642c77..66bab6373 100644 --- a/Foundation/include/Poco/UniqueExpireStrategy.h +++ b/Foundation/include/Poco/UniqueExpireStrategy.h @@ -1,7 +1,7 @@ // // UniqueExpireStrategy.h // -// $Id: //poco/svn/Foundation/include/Poco/UniqueExpireStrategy.h#3 $ +// $Id: //poco/1.4/Foundation/include/Poco/UniqueExpireStrategy.h#1 $ // // Library: Foundation // Package: Cache @@ -36,8 +36,8 @@ // -#ifndef Foundation_UniqueExpireStrategy_INCLUDED -#define Foundation_UniqueExpireStrategy_INCLUDED +#ifndef Foundation_UniqueExpireStrategy_INCLUDED +#define Foundation_UniqueExpireStrategy_INCLUDED #include "Poco/KeyValueArgs.h" @@ -157,4 +157,4 @@ protected: } // namespace Poco -#endif +#endif // Foundation_UniqueExpireStrategy_INCLUDED diff --git a/Foundation/include/Poco/ValidArgs.h b/Foundation/include/Poco/ValidArgs.h index 21548ce13..13aa5fc91 100644 --- a/Foundation/include/Poco/ValidArgs.h +++ b/Foundation/include/Poco/ValidArgs.h @@ -1,7 +1,7 @@ // // ValidArgs.h // -// $Id: //poco/svn/Foundation/include/Poco/ValidArgs.h#2 $ +// $Id: //poco/1.4/Foundation/include/Poco/ValidArgs.h#1 $ // // Library: Foundation // Package: Cache @@ -36,8 +36,8 @@ // -#ifndef Foundation_ValidArgs_INCLUDED -#define Foundation_ValidArgs_INCLUDED +#ifndef Foundation_ValidArgs_INCLUDED +#define Foundation_ValidArgs_INCLUDED #include "Poco/Foundation.h" @@ -93,4 +93,4 @@ private: } // namespace Poco -#endif +#endif // Foundation_ValidArgs_INCLUDED