trunk/branch integration: source indentation

This commit is contained in:
Marian Krivos
2011-08-22 18:26:20 +00:00
parent a967b0fb9e
commit cf8a7c0618
7 changed files with 39 additions and 38 deletions

View File

@@ -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<TKey, TValue, UniqueAccessExpireStrategy<TKey, TValue>, TMutex, TEventMutex >
class UniqueAccessExpireCache: public AbstractCache<TKey, TValue, UniqueAccessExpireStrategy<TKey, TValue>, 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

View File

@@ -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<TKey, TValue, StrategyCollection<TKey, TValue>, TMutex, TEventMutex >
class UniqueAccessExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue>, 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).

View File

@@ -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 <set>
#include <map>
#include <stdio.h>
namespace Poco {
template <
class TKey,
class TValue
@@ -71,12 +70,12 @@ class UniqueAccessExpireStrategy: public AbstractStrategy<TKey, TValue>
/// which returns the timespan for how long an object will be valid without being accessed.
{
public:
typedef std::pair<TKey, Timespan> KeyExpire;
typedef std::multimap<Timestamp, KeyExpire> TimeIndex;
typedef typename TimeIndex::iterator IndexIterator;
typedef typename TimeIndex::const_iterator ConstIndexIterator;
typedef std::map<TKey, IndexIterator> Keys;
typedef typename Keys::iterator Iterator;
typedef std::pair<TKey, Timespan> KeyExpire;
typedef std::multimap<Timestamp, KeyExpire> TimeIndex;
typedef typename TimeIndex::iterator IndexIterator;
typedef typename TimeIndex::const_iterator ConstIndexIterator;
typedef std::map<TKey, IndexIterator> Keys;
typedef typename Keys::iterator Iterator;
public:
UniqueAccessExpireStrategy()
@@ -175,4 +174,5 @@ protected:
} // namespace Poco
#endif
#endif // Foundation_UniqueAccessExpireStrategy_INCLUDED

View File

@@ -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<TKey, TValue, UniqueExpireStrategy<TKey, TValue>, TMutex, TEventMutex >
class UniqueExpireCache: public AbstractCache<TKey, TValue, UniqueExpireStrategy<TKey, TValue>, 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

View File

@@ -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<TKey, TValue, StrategyCollection<TKey, TValue>, TMutex, TEventMutex >
class UniqueExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue>, 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

View File

@@ -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

View File

@@ -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