generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-02-21 06:37:42 +01:00
Code Issues Projects Releases Wiki Activity

trunk/branch integration: documentation

Browse Source
This commit is contained in:
Marian Krivos 2011-08-23 07:01:17 +00:00
parent eefd04cc75
commit 308170b4cb
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Foundation/include/Poco/StrategyCollection.h
View File

@ -1,7 +1,7 @@
//
// StrategyCollection.h
//
// $Id: //poco/svn/Foundation/include/Poco/StrategyCollection.h#2 $
// $Id: //poco/1.4/Foundation/include/Poco/StrategyCollection.h#1 $
//
// Library: Foundation
// Package: Cache
@ -36,8 +36,8 @@
//
#ifndef Foundation_StrategyCollection_INCLUDED
#define Foundation_StrategyCollection_INCLUDED
#ifndef Foundation_StrategyCollection_INCLUDED
#define Foundation_StrategyCollection_INCLUDED
#include "Poco/KeyValueArgs.h"
@ -52,10 +52,10 @@ namespace Poco {
template <class TKey, class TValue>
class StrategyCollection: public AbstractStrategy<TKey, TValue>
/// An StrategyCollection is a decorator masking n collections as a single one
/// An StrategyCollection is a decorator masking n collections as a single one.
{
public:
typedef std::vector<SharedPtr<AbstractStrategy<TKey, TValue> > > Strategies;
typedef std::vector<SharedPtr<AbstractStrategy<TKey, TValue> > > Strategies;
typedef typename Strategies::iterator Iterator;
typedef typename Strategies::const_iterator ConstIterator;
@ -152,4 +152,4 @@ protected:
} // namespace Poco
#endif
#endif // Foundation_StrategyCollection_INCLUDED

25
Foundation/include/Poco/StreamUtil.h
View File

@ -1,7 +1,7 @@
//
// StreamUtil.h
//
// $Id: //poco/svn/Foundation/include/Poco/StreamUtil.h#2 $
// $Id: //poco/1.4/Foundation/include/Poco/StreamUtil.h#1 $
//
// Library: Foundation
// Package: Streams
@ -45,7 +45,7 @@
// poco_ios_init
//
// This is a workaround for a bug in the Microsoft
// This is a workaround for a bug in the Dinkumware
// implementation of iostreams.
//
// Calling basic_ios::init() multiple times for the
@ -90,11 +90,24 @@
// Some stream implementations, however, require that
// init() is called in the MyIOS constructor.
// Therefore we replace each call to init() with
// the following macro:
#if defined(_MSC_VER) && (!defined(_STLP_MSVC) || defined(_STLP_NO_OWN_IOSTREAMS))
#define poco_ios_init(buf)
// the poco_ios_init macro defined below.
#if !defined(POCO_IOS_INIT_HACK)
// Microsoft Visual Studio with Dinkumware STL (but not STLport)
# if defined(_MSC_VER) && (!defined(_STLP_MSVC) || defined(_STLP_NO_OWN_IOSTREAMS))
# define POCO_IOS_INIT_HACK 1
// QNX with Dinkumware but not GNU C++ Library
# elif defined(__QNX__) && !defined(__GLIBCPP__)
# define POCO_IOS_INIT_HACK 1
# endif
#endif
#if defined(POCO_IOS_INIT_HACK)
# define poco_ios_init(buf)
#else
#define poco_ios_init(buf) init(buf)
# define poco_ios_init(buf) init(buf)
#endif