dbertoni 2002/11/20 16:30:42
Modified: c/src/Include STLHelper.hpp XalanArrayKeyMap.hpp
XalanObjectCache.hpp
Log:
Fixed ifdefs.
Revision Changes Path
1.8 +20 -20 xml-xalan/c/src/Include/STLHelper.hpp
Index: STLHelper.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/STLHelper.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- STLHelper.hpp 20 Nov 2002 02:23:09 -0000 1.7
+++ STLHelper.hpp 21 Nov 2002 00:30:42 -0000 1.8
@@ -77,13 +77,13 @@
* Functor to delete objects, used in STL iteration algorithms.
*/
template <class T>
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct DeleteFunctor : public unary_function<const T*, void>
#else
struct DeleteFunctor : public std::unary_function<const T*, void>
#endif
{
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef unary_function<const T*, void> BaseClassType;
#else
typedef std::unary_function<const T*, void> BaseClassType;
@@ -117,13 +117,13 @@
* iteration algorithms.
*/
template <class PairType>
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct select1st : public unary_function<PairType, PairType::first_type>
#else
struct select1st : public std::unary_function<PairType, typename
PairType::first_type>
#endif
{
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef unary_function<PairType, PairType::first_type> BaseClassType;
#else
typedef std::unary_function<PairType, typename PairType::first_type>
BaseClassType;
@@ -154,13 +154,13 @@
* iteration algorithms.
*/
template <class PairType>
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct select2nd : public unary_function<PairType, PairType::second_type>
#else
struct select2nd : public std::unary_function<PairType, typename
PairType::second_type>
#endif
{
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef unary_function<PairType, PairType::second_type> BaseClassType;
#else
typedef std::unary_function<PairType, typename PairType::second_type>
BaseClassType;
@@ -192,13 +192,13 @@
* Functor to call a clear() member function on its argument.
*/
template <class Type>
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct ClearFunctor : public unary_function<Type, void>
#else
struct ClearFunctor : public std::unary_function<Type, void>
#endif
{
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef unary_function<Type, void> BaseClassType;
#else
typedef std::unary_function<Type, void> BaseClassType;
@@ -228,13 +228,13 @@
* Functor to delete value objects in maps, used in STL iteration algorithms.
*/
template <class T>
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct MapValueDeleteFunctor : public unary_function<const typename
T::value_type&, void>
#else
struct MapValueDeleteFunctor : public std::unary_function<const typename
T::value_type&, void>
#endif
{
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef unary_function<const typename T::value_type&, void>
BaseClassType;
#else
typedef std::unary_function<const typename T::value_type&, void>
BaseClassType;
@@ -277,13 +277,13 @@
* the default will allow the map to work as expected.
*/
template<class T>
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct less_null_terminated_arrays : public binary_function<const T*, const
T*, bool>
#else
struct less_null_terminated_arrays : public std::binary_function<const T*,
const T*, bool>
#endif
{
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef binary_function<const T*, const T*, bool>
BaseClassType;
#else
typedef std::binary_function<const T*, const T*, bool>
BaseClassType;
@@ -377,7 +377,7 @@
{
if (m_collection != 0)
{
-#if !defined(XALAN_NO_NAMESPACES)
+#if !defined(XALAN_NO_STD_NAMESPACE)
using std::for_each;
#endif
@@ -409,13 +409,13 @@
template<class T>
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct pointer_equals : public binary_function<const T*, const T*, bool>
#else
struct pointer_equals : public std::binary_function<const T*, const T*, bool>
#endif
{
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef binary_function<const T*, const T*, bool>
BaseClassType;
#else
typedef std::binary_function<const T*, const T*, bool>
BaseClassType;
@@ -439,13 +439,13 @@
template<class T>
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct pointer_equals_predicate : public unary_function<const T*, bool>
#else
struct pointer_equals_predicate : public std::unary_function<const T*, bool>
#endif
{
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef unary_function<const T*, bool> BaseClassType;
#else
typedef std::unary_function<const T*, bool> BaseClassType;
@@ -476,13 +476,13 @@
template<class T>
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct pointer_less : public binary_function<const T*, const T*, bool>
#else
struct pointer_less : public std::binary_function<const T*, const T*, bool>
#endif
{
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef binary_function<const T*, const T*, bool>
BaseClassType;
#else
typedef std::binary_function<const T*, const T*, bool>
BaseClassType;
@@ -499,7 +499,7 @@
{
assert(theLHS != 0 && theRHS != 0);
-#if !defined(XALAN_NO_NAMESPACES)
+#if !defined(XALAN_NO_STD_NAMESPACE)
using std::less;
#endif
1.7 +2 -2 xml-xalan/c/src/Include/XalanArrayKeyMap.hpp
Index: XalanArrayKeyMap.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/XalanArrayKeyMap.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanArrayKeyMap.hpp 20 Nov 2002 02:23:10 -0000 1.6
+++ XalanArrayKeyMap.hpp 21 Nov 2002 00:30:42 -0000 1.7
@@ -74,7 +74,7 @@
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<KeyType>
VectorType;
typedef map<const KeyType*, ValueType, CompareType> MapType;
typedef deque<VectorType>
VectorHolderType;
@@ -100,7 +100,7 @@
typedef typename MapType::reverse_iterator
reverse_iterator;
typedef typename MapType::const_reverse_iterator
const_reverse_iterator;
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef pair<iterator, bool>
insert_pair_type;
typedef pair<iterator, iterator>
range_pair_type;
typedef pair<const_iterator, const_iterator> const_range_pair_type;
1.8 +5 -5 xml-xalan/c/src/Include/XalanObjectCache.hpp
Index: XalanObjectCache.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/XalanObjectCache.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanObjectCache.hpp 20 Nov 2002 02:23:10 -0000 1.7
+++ XalanObjectCache.hpp 21 Nov 2002 00:30:42 -0000 1.8
@@ -131,7 +131,7 @@
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<ObjectType*> VectorType;
#else
typedef std::vector<ObjectType*> VectorType;
@@ -153,7 +153,7 @@
{
reset();
-#if !defined(XALAN_NO_NAMESPACES)
+#if !defined(XALAN_NO_STD_NAMESPACE)
using std::for_each;
#endif
@@ -191,7 +191,7 @@
bool
release(ObjectType* theInstance)
{
-#if !defined(XALAN_NO_NAMESPACES)
+#if !defined(XALAN_NO_STD_NAMESPACE)
using std::find;
#endif
@@ -277,7 +277,7 @@
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<ObjectType*> VectorType;
#else
typedef std::vector<ObjectType*> VectorType;
@@ -296,7 +296,7 @@
{
reset();
-#if !defined(XALAN_NO_NAMESPACES)
+#if !defined(XALAN_NO_STD_NAMESPACE)
using std::for_each;
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
