6 files changed, 6 insertions, 6 deletions

diff --git a/include/opkele/iterator.h b/include/opkele/iterator.h
index 28c1c83..8f86234 100644
--- a/include/opkele/iterator.h
+++ b/include/opkele/iterator.h
diff --git a/lib/discovery.cc b/lib/discovery.cc
index d1989ec..984e308 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
diff --git a/lib/message.cc b/lib/message.cc
index 524946a..c1f8088 100644
--- a/lib/message.cc
+++ b/lib/message.cc
diff --git a/lib/prequeue_rp.cc b/lib/prequeue_rp.cc
index e499d08..886efae 100644
--- a/lib/prequeue_rp.cc
+++ b/lib/prequeue_rp.cc
@@ -41,11 +41,11 @@ namespace opkele {
 	    OP_verifier& operator++() { return *this; }
 	    OP_verifier& operator++(int) { return *this; }
     };
 
-    void prequeue_RP::verify_OP(const string& OP,const string& claimed_id,const string& id) const {
+    void prequeue_RP::verify_OP(const string& OP,const string& _claimed_id,const string& id) const {
 	try {
-	    discover(OP_verifier(OP,id),claimed_id);
+	    discover(OP_verifier(OP,id),_claimed_id);
 	    throw id_res_unauthorized(OPKELE_CP_
 		    "OP is not authorized to make an assertion regarding the identity");
 	}catch(__OP_verifier_good_input& ovgi) {
 	}
diff --git a/lib/secret.cc b/lib/secret.cc
index d538890..3f1e39c 100644
--- a/lib/secret.cc
+++ b/lib/secret.cc
@@ -9,9 +9,9 @@ namespace opkele {
 
     template<class __a1,class __a2,class __r>
 	struct bitwise_xor : public binary_function<__a1,__a2,__r> {
 	    __r operator() (const __a1& a1,const __a2& a2) const {
-		return a1^a2;
+		return (__r)(a1^a2);
 	    }
 	};
 
     void secret_t::enxor_to_base64(const unsigned char *key_d,string& rv) const {
diff --git a/lib/util.cc b/lib/util.cc
index b702291..d979502 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -210,9 +210,9 @@ namespace opkele {
 			    throw failed_conversion(OPKELE_CP_ "not enough hexadecimals after the percent sign in url-encoded string");
 			tmp[1] = *i;
 			if(!(isxdigit(tmp[0]) && isxdigit(tmp[1])))
 			    throw failed_conversion(OPKELE_CP_ "non-hex follows percent in url-encoded string");
-			*(ii++) = strtol(tmp,0,16);
+			*(ii++) = (char)strtol(tmp,0,16);
 			break;
 		    default:
 			*(ii++) = *i; break;
 		}
@@ -347,12 +347,12 @@ namespace opkele {
 		     if(!( isxdigit(tmp[0]) && isxdigit(tmp[1]) ))
 			 throw bad_input(OPKELE_CP_ "Invalid percent-encoded character in URI being normalized");
 		     int cc = strtol(tmp,0,16);
 		     if( isalpha(cc) || isdigit(cc) || strchr("._~-",cc) )
-			 pseg += cc;
+			 pseg += (char)cc;
 		     else{
 			 pseg += '%';
-			 pseg += toupper(tmp[0]); pseg += toupper(tmp[1]);
+			 pseg += (char)toupper(tmp[0]); pseg += (char)toupper(tmp[1]);
 		     }
 		 }else if(qf) {
 		     rv += pseg; rv += c;
 		     pseg.clear();