From 308170b4cb594ff1bc588d780d715ce55edf92d6 Mon Sep 17 00:00:00 2001
From: Marian Krivos <nezmar@tutok.sk>
Date: Tue, 23 Aug 2011 07:01:17 +0000
Subject: [PATCH] trunk/branch integration: documentation

---
 Foundation/include/Poco/StrategyCollection.h | 12 +++++-----
 Foundation/include/Poco/StreamUtil.h         | 25 +++++++++++++++-----
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/Foundation/include/Poco/StrategyCollection.h b/Foundation/include/Poco/StrategyCollection.h
index 0a720975e..d80a72cb4 100644
--- a/Foundation/include/Poco/StrategyCollection.h
+++ b/Foundation/include/Poco/StrategyCollection.h
@@ -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
diff --git a/Foundation/include/Poco/StreamUtil.h b/Foundation/include/Poco/StreamUtil.h
index 4d34e72f3..29a24187b 100644
--- a/Foundation/include/Poco/StreamUtil.h
+++ b/Foundation/include/Poco/StreamUtil.h
@@ -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