jberry 2003/11/25 12:37:40
Modified: c/src/xercesc/framework/psvi XSElementDeclaration.cpp
c/src/xercesc/internal XSerializeEngine.cpp
XSerializeEngine.hpp
Log:
Cleanup build errors/warnings from CodeWarrior
Revision Changes Path
1.8 +4 -1 xml-xerces/c/src/xercesc/framework/psvi/XSElementDeclaration.cpp
Index: XSElementDeclaration.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSElementDeclaration.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSElementDeclaration.cpp 23 Nov 2003 16:20:16 -0000 1.7
+++ XSElementDeclaration.cpp 25 Nov 2003 20:37:40 -0000 1.8
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2003/11/25 20:37:40 jberry
+ * Cleanup build errors/warnings from CodeWarrior
+ *
* Revision 1.7 2003/11/23 16:20:16 knoaman
* PSVI: pass scope and enclosing type during construction.
*
@@ -133,7 +136,7 @@
fDisallowedSubstitutions |= XSConstants::DERIVATION_SUBSTITUTION;
}
- if (blockFinalSet = fSchemaElementDecl->getFinalSet())
+ if (0 != (blockFinalSet = fSchemaElementDecl->getFinalSet()))
{
if (blockFinalSet & SchemaSymbols::XSD_EXTENSION)
fSubstitutionGroupExclusions |= XSConstants::DERIVATION_EXTENSION;
1.9 +6 -3 xml-xerces/c/src/xercesc/internal/XSerializeEngine.cpp
Index: XSerializeEngine.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XSerializeEngine.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSerializeEngine.cpp 20 Oct 2003 17:37:05 -0000 1.8
+++ XSerializeEngine.cpp 25 Nov 2003 20:37:40 -0000 1.9
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.9 2003/11/25 20:37:40 jberry
+ * Cleanup build errors/warnings from CodeWarrior
+ *
* Revision 1.8 2003/10/20 17:37:05 amassari
* Removed compiler warning
*
@@ -214,7 +217,7 @@
{
*this << fgNullObjectTag;
}
- else if (objIndex = lookupStorePool((void*) objectToWrite))
+ else if (0 != (objIndex = lookupStorePool((void*) objectToWrite)))
{
// writing an object reference tag
*this << objIndex;
@@ -1022,7 +1025,7 @@
*this << fgNullObjectTag; // null pointer
return false;
}
- else if (objIndex = lookupStorePool(templateObjectToWrite))
+ else if (0 != (objIndex = lookupStorePool(templateObjectToWrite)))
{
*this << objIndex; // write an object reference tag
return false;
1.9 +10 -7 xml-xerces/c/src/xercesc/internal/XSerializeEngine.hpp
Index: XSerializeEngine.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XSerializeEngine.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSerializeEngine.hpp 11 Nov 2003 22:48:13 -0000 1.8
+++ XSerializeEngine.hpp 25 Nov 2003 20:37:40 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2003/11/25 20:37:40 jberry
+ * Cleanup build errors/warnings from CodeWarrior
+ *
* Revision 1.8 2003/11/11 22:48:13 knoaman
* Serialization of XSAnnotation.
*
@@ -108,6 +111,12 @@
enum { mode_Store
, mode_Load
};
+
+
+ static const bool toReadBufferLen;
+ static int defaultBufferLen;
+ static int defaultDataLen;
+
typedef unsigned long XSerializedObjectId_t;
@@ -422,12 +431,6 @@
*
***/
void registerObject(void* const templateObjectToRegister);
-
- static const bool toReadBufferLen;
-
- static int defaultBufferLen;
-
- static int defaultDataLen;
/***
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
