Browse Source

Eliminate Windows warnings.

Adam Ierymenko 9 years ago
parent
commit
ccae473783
2 changed files with 3 additions and 3 deletions
  1. 2 2
      node/Node.cpp
  2. 1 1
      node/Topology.cpp

+ 2 - 2
node/Node.cpp

@@ -203,7 +203,7 @@ public:
 		for(std::vector<World::Root>::const_iterator r(_world.roots().begin());r!=_world.roots().end();++r) {
 			if (r->identity.address() == p->address()) {
 				upstream = true;
-				for(unsigned long k=0,ptr=RR->node->prng();k<r->stableEndpoints.size();++k) {
+				for(unsigned long k=0,ptr=(unsigned long)RR->node->prng();k<(unsigned long)r->stableEndpoints.size();++k) {
 					const InetAddress &addr = r->stableEndpoints[ptr++ % r->stableEndpoints.size()];
 					if (!stableEndpoint4) {
 						if (addr.ss_family == AF_INET)
@@ -536,7 +536,7 @@ ZT_ResultCode Node::circuitTestBegin(ZT_CircuitTest *test,void (*reportCallback)
 			outp.append((uint16_t)0);
 			C25519::Signature sig(RR->identity.sign(reinterpret_cast<const char *>(outp.data()) + ZT_PACKET_IDX_PAYLOAD,outp.size() - ZT_PACKET_IDX_PAYLOAD));
 			outp.append((uint16_t)sig.size());
-			outp.append(sig.data,sig.size());
+			outp.append(sig.data,(unsigned int)sig.size());
 			outp.append((uint16_t)0); // originator doesn't need an extra credential, since it's the originator
 			for(unsigned int h=1;h<test->hopCount;++h) {
 				outp.append((uint8_t)0);

+ 1 - 1
node/Topology.cpp

@@ -76,7 +76,7 @@ Topology::Topology(const RuntimeEnvironment *renv) :
 	std::string dsWorld(RR->node->dataStoreGet("world"));
 	World cachedWorld;
 	try {
-		Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH> dswtmp(dsWorld.data(),dsWorld.length());
+		Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH> dswtmp(dsWorld.data(),(unsigned int)dsWorld.length());
 		cachedWorld.deserialize(dswtmp,0);
 	} catch ( ... ) {
 		cachedWorld = World(); // clear if cached world is invalid