You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2005/02/26 12:01:15 UTC
cvs commit: xml-security/c/src/xkms/impl XKMSCompoundRequestImpl.cpp XKMSCompoundResultImpl.cpp XKMSKeyBindingAbstractTypeImpl.cpp XKMSLocateResultImpl.cpp XKMSRegisterResultImpl.cpp XKMSRequestAbstractTypeImpl.cpp XKMSValidateResultImpl.cpp
blautenb 2005/02/26 03:01:15
Modified: c/src/xkms/impl XKMSCompoundRequestImpl.cpp
XKMSCompoundResultImpl.cpp
XKMSKeyBindingAbstractTypeImpl.cpp
XKMSLocateResultImpl.cpp XKMSRegisterResultImpl.cpp
XKMSRequestAbstractTypeImpl.cpp
XKMSValidateResultImpl.cpp
Log:
Clean compile under VC7.0
Revision Changes Path
1.5 +3 -3 xml-security/c/src/xkms/impl/XKMSCompoundRequestImpl.cpp
Index: XKMSCompoundRequestImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSCompoundRequestImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XKMSCompoundRequestImpl.cpp 26 Feb 2005 03:17:08 -0000 1.4
+++ XKMSCompoundRequestImpl.cpp 26 Feb 2005 11:01:15 -0000 1.5
@@ -141,13 +141,13 @@
int XKMSCompoundRequestImpl::getRequestListSize(void) {
- return m_requestList.size();
+ return (int) m_requestList.size();
}
XKMSRequestAbstractType * XKMSCompoundRequestImpl::getRequestListItem(int item) {
- if (item < 0 || item >= m_requestList.size()) {
+ if (item < 0 || item >= (int) m_requestList.size()) {
throw XSECException(XSECException::XKMSError,
"XKMSCompoundRequest::getRequestListItem - item out of range");
1.6 +3 -3 xml-security/c/src/xkms/impl/XKMSCompoundResultImpl.cpp
Index: XKMSCompoundResultImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSCompoundResultImpl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XKMSCompoundResultImpl.cpp 26 Feb 2005 03:17:08 -0000 1.5
+++ XKMSCompoundResultImpl.cpp 26 Feb 2005 11:01:15 -0000 1.6
@@ -145,13 +145,13 @@
int XKMSCompoundResultImpl::getResultListSize(void) {
- return m_resultList.size();
+ return (int) m_resultList.size();
}
XKMSResultType * XKMSCompoundResultImpl::getResultListItem(int item) {
- if (item < 0 || item >= m_resultList.size()) {
+ if (item < 0 || item >= (int) m_resultList.size()) {
throw XSECException(XSECException::XKMSError,
"XKMSCompoundResult::getResultListItem - item out of range");
1.9 +3 -3 xml-security/c/src/xkms/impl/XKMSKeyBindingAbstractTypeImpl.cpp
Index: XKMSKeyBindingAbstractTypeImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSKeyBindingAbstractTypeImpl.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XKMSKeyBindingAbstractTypeImpl.cpp 3 Feb 2005 14:30:29 -0000 1.8
+++ XKMSKeyBindingAbstractTypeImpl.cpp 26 Feb 2005 11:01:15 -0000 1.9
@@ -460,13 +460,13 @@
int XKMSKeyBindingAbstractTypeImpl::getUseKeyWithSize(void) const {
- return m_useKeyWithList.size();
+ return (int) m_useKeyWithList.size();
}
XKMSUseKeyWith * XKMSKeyBindingAbstractTypeImpl::getUseKeyWithItem(int item) const {
- if (item < 0 || item >= m_useKeyWithList.size()) {
+ if (item < 0 || item >= (int) m_useKeyWithList.size()) {
throw XSECException(XSECException::XKMSError,
"XKMSKeyBindingAbstractType::getUseKeyWithItem - item out of range");
}
1.4 +4 -4 xml-security/c/src/xkms/impl/XKMSLocateResultImpl.cpp
Index: XKMSLocateResultImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSLocateResultImpl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XKMSLocateResultImpl.cpp 26 Feb 2005 03:17:08 -0000 1.3
+++ XKMSLocateResultImpl.cpp 26 Feb 2005 11:01:15 -0000 1.4
@@ -97,7 +97,7 @@
if (nl != NULL) {
XKMSUnverifiedKeyBindingImpl * ukb;
- for (int i = 0; i < nl->getLength() ; ++ i) {
+ for (unsigned int i = 0; i < nl->getLength() ; ++ i) {
XSECnew(ukb, XKMSUnverifiedKeyBindingImpl(mp_env, (DOMElement *) nl->item(i)));
m_unverifiedKeyBindingList.push_back(ukb);
@@ -144,13 +144,13 @@
int XKMSLocateResultImpl::getUnverifiedKeyBindingSize(void) const {
- return m_unverifiedKeyBindingList.size();
+ return (int) m_unverifiedKeyBindingList.size();
}
XKMSUnverifiedKeyBinding * XKMSLocateResultImpl::getUnverifiedKeyBindingItem(int item) const {
- if (item < 0 || item >= m_unverifiedKeyBindingList.size()) {
+ if (item < 0 || item >= (int) m_unverifiedKeyBindingList.size()) {
throw XSECException(XSECException::XKMSError,
"XKMSLocateResult::getUnverifiedKeyBindingItem - item out of range");
}
1.4 +4 -4 xml-security/c/src/xkms/impl/XKMSRegisterResultImpl.cpp
Index: XKMSRegisterResultImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSRegisterResultImpl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XKMSRegisterResultImpl.cpp 26 Feb 2005 03:17:08 -0000 1.3
+++ XKMSRegisterResultImpl.cpp 26 Feb 2005 11:01:15 -0000 1.4
@@ -97,7 +97,7 @@
if (nl != NULL) {
XKMSKeyBindingImpl * kb;
- for (int i = 0; i < nl->getLength() ; ++ i) {
+ for (unsigned int i = 0; i < nl->getLength() ; ++ i) {
XSECnew(kb, XKMSKeyBindingImpl(mp_env, (DOMElement *) nl->item(i)));
m_keyBindingList.push_back(kb);
@@ -144,13 +144,13 @@
int XKMSRegisterResultImpl::getKeyBindingSize(void) const {
- return m_keyBindingList.size();
+ return (int) m_keyBindingList.size();
}
XKMSKeyBinding * XKMSRegisterResultImpl::getKeyBindingItem(int item) const {
- if (item < 0 || item >= m_keyBindingList.size()) {
+ if (item < 0 || item >= (int) m_keyBindingList.size()) {
throw XSECException(XSECException::XKMSError,
"XKMSRegisterResult::getKeyBindingItem - item out of range");
}
1.10 +10 -10 xml-security/c/src/xkms/impl/XKMSRequestAbstractTypeImpl.cpp
Index: XKMSRequestAbstractTypeImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSRequestAbstractTypeImpl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XKMSRequestAbstractTypeImpl.cpp 3 Feb 2005 14:30:30 -0000 1.9
+++ XKMSRequestAbstractTypeImpl.cpp 26 Feb 2005 11:01:15 -0000 1.10
@@ -97,7 +97,7 @@
if (nl != NULL) {
XKMSRespondWithImpl * rw;
- for (int i = 0; i < nl->getLength() ; ++ i) {
+ for (unsigned int i = 0; i < nl->getLength() ; ++ i) {
XSECnew(rw, XKMSRespondWithImpl(mp_env, (DOMElement *) nl->item(i)));
rw->load();
@@ -115,7 +115,7 @@
if (nl != NULL) {
XKMSResponseMechanismImpl * rm;
- for (int i = 0; i < nl->getLength() ; ++ i) {
+ for (unsigned int i = 0; i < nl->getLength() ; ++ i) {
XSECnew(rm, XKMSResponseMechanismImpl(mp_env, (DOMElement *) nl->item(i)));
rm->load();
@@ -216,13 +216,13 @@
int XKMSRequestAbstractTypeImpl::getRespondWithSize(void) {
- return m_respondWithList.size();
+ return (int) m_respondWithList.size();
}
XKMSRespondWith * XKMSRequestAbstractTypeImpl::getRespondWithItem(int item) {
- if (item < 0 || item >= m_respondWithList.size()) {
+ if (item < 0 || item >= (int) m_respondWithList.size()) {
throw XSECException(XSECException::RequestAbstractTypeError,
"XKMSRequestAbstractTypeImpl::getRespondWithItem - item out of range");
@@ -235,7 +235,7 @@
const XMLCh * XKMSRequestAbstractTypeImpl::getRespondWithItemStr(int item) {
- if (item < 0 || item >= m_respondWithList.size()) {
+ if (item < 0 || item >= (int) m_respondWithList.size()) {
throw XSECException(XSECException::RequestAbstractTypeError,
"XKMSRequestAbstractTypeImpl::getRespondWithItem - item out of range");
@@ -291,13 +291,13 @@
int XKMSRequestAbstractTypeImpl::getResponseMechanismSize(void) {
- return m_responseMechanismList.size();
+ return (int) m_responseMechanismList.size();
}
XKMSResponseMechanism * XKMSRequestAbstractTypeImpl::getResponseMechanismItem(int item) {
- if (item < 0 || item >= m_responseMechanismList.size()) {
+ if (item < 0 || item >= (int) m_responseMechanismList.size()) {
throw XSECException(XSECException::RequestAbstractTypeError,
"XKMSRequestAbstractTypeImpl::getResponseMechanismItem - item out of range");
@@ -310,7 +310,7 @@
const XMLCh * XKMSRequestAbstractTypeImpl::getResponseMechanismItemStr(int item) {
- if (item < 0 || item >= m_responseMechanismList.size()) {
+ if (item < 0 || item >= (int) m_responseMechanismList.size()) {
throw XSECException(XSECException::RequestAbstractTypeError,
"XKMSRequestAbstractTypeImpl::getResponseMechanismItem - item out of range");
@@ -363,7 +363,7 @@
void XKMSRequestAbstractTypeImpl::removeResponseMechanismItem(int item) {
- if (item < 0 || item >= m_responseMechanismList.size()) {
+ if (item < 0 || item >= (int) m_responseMechanismList.size()) {
throw XSECException(XSECException::RequestAbstractTypeError,
"XKMSRequestAbstractTypeImpl::getResponseMechanismItem - item out of range");
1.5 +4 -4 xml-security/c/src/xkms/impl/XKMSValidateResultImpl.cpp
Index: XKMSValidateResultImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSValidateResultImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XKMSValidateResultImpl.cpp 26 Feb 2005 03:17:08 -0000 1.4
+++ XKMSValidateResultImpl.cpp 26 Feb 2005 11:01:15 -0000 1.5
@@ -97,7 +97,7 @@
if (nl != NULL) {
XKMSKeyBindingImpl * kb;
- for (int i = 0; i < nl->getLength() ; ++ i) {
+ for (unsigned int i = 0; i < nl->getLength() ; ++ i) {
XSECnew(kb, XKMSKeyBindingImpl(mp_env, (DOMElement *) nl->item(i)));
m_keyBindingList.push_back(kb);
@@ -144,13 +144,13 @@
int XKMSValidateResultImpl::getKeyBindingSize(void) const {
- return m_keyBindingList.size();
+ return (int) m_keyBindingList.size();
}
XKMSKeyBinding * XKMSValidateResultImpl::getKeyBindingItem(int item) const {
- if (item < 0 || item >= m_keyBindingList.size()) {
+ if (item < 0 || item >= (int) m_keyBindingList.size()) {
throw XSECException(XSECException::XKMSError,
"XKMSValidateResult::getKeyBindingItem - item out of range");
}