svn commit: r1298077 - in /xalan/c/trunk: samples/UseStylesheetParam/UseStylesheetParam.cpp src/xalanc/XSLT/StylesheetRoot.hpp src/xalanc/XalanDOM/XalanDOMString.hpp

Author: shathaway
Date: Wed Mar  7 20:00:11 2012
New Revision: 1298077

URL: http://svn.apache.org/viewvc?rev=1298077&view=rev
Log:
Fix some logic compile warnings

Modified:
    xalan/c/trunk/samples/UseStylesheetParam/UseStylesheetParam.cpp
    xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.hpp
    xalan/c/trunk/src/xalanc/XalanDOM/XalanDOMString.hpp

Modified: xalan/c/trunk/samples/UseStylesheetParam/UseStylesheetParam.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/UseStylesheetParam/UseStylesheetParam.cpp?rev=1298077&r1=1298076&r2=1298077&view=diff
==============================================================================
--- xalan/c/trunk/samples/UseStylesheetParam/UseStylesheetParam.cpp (original)
+++ xalan/c/trunk/samples/UseStylesheetParam/UseStylesheetParam.cpp Wed Mar  7 20:00:11 2012
@@ -24,6 +24,9 @@
 #include <iostream>
 #endif
 
+// for 'C' strcmp function used in parsing main() parameters
+#include <string.h>
+
 #include <xercesc/util/PlatformUtils.hpp>
 
 #include <xalanc/XalanTransformer/XalanTransformer.hpp>

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.hpp?rev=1298077&r1=1298076&r2=1298077&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.hpp Wed Mar  7 20:00:11 2012
@@ -365,8 +365,8 @@ public:
     bool
     hasCDATASectionElements() const
     {
-        assert(m_hasCDATASectionElems == false && m_cdataSectionElems.empty() == true ||
-               m_hasCDATASectionElems == true && m_cdataSectionElems.empty() == false);
+        assert((m_hasCDATASectionElems == false && m_cdataSectionElems.empty() == true ) ||
+              ( m_hasCDATASectionElems == true && m_cdataSectionElems.empty() == false));
 
         return m_hasCDATASectionElems;
     }

Modified: xalan/c/trunk/src/xalanc/XalanDOM/XalanDOMString.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanDOM/XalanDOMString.hpp?rev=1298077&r1=1298076&r2=1298077&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanDOM/XalanDOMString.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanDOM/XalanDOMString.hpp Wed Mar  7 20:00:11 2012
@@ -605,8 +605,8 @@ public:
             size_type           thePosition = 0,
             size_type           theCount = size_type(npos)) const
     {
-        assert(theCount == size_type(npos) && thePosition < length() ||
-               thePosition + theCount <= length());
+        assert((theCount == size_type(npos) && thePosition < length() ) ||
+               (thePosition + theCount <= length()));
 
         invariants();