Reduce number of warnings for 64-bit targets.

src/jrd/SimilarToMatcher.h

@@ -350,7 +350,7 @@ bool SimilarToMatcher<StrConverter, CharType>::Evaluator::getResult()
 template <typename StrConverter, typename CharType>
 bool SimilarToMatcher<StrConverter, CharType>::Evaluator::processNextChunk(const UCHAR* data, SLONG dataLen)
 {
-	ULONG pos = buffer.getCount();
+	const size_t pos = buffer.getCount();
 	memcpy(buffer.getBuffer(pos + dataLen) + pos, data, dataLen);
 	return true;
 }

src/jrd/jrd.h

@@ -468,9 +468,8 @@ public:
 		return FB_NEW(p) vec_base<T, TYPE>(p, base);
 	}
 	*/
-		
+
-	// CVC: This should be size_t instead of ULONG for maximum portability.
+	size_t count() const { return v.getCount(); }
-	ULONG count() const { return v.getCount(); }
 	T& operator[](size_t index) { return v[index]; }
 	const T& operator[](size_t index) const { return v[index]; }
 
@@ -479,10 +478,9 @@ public:
 
 	const_iterator begin() const { return v.begin(); }
 	const_iterator end() const { return v.end(); }
-	
+
 	void clear() { v.clear(); }
-	//void prepend(int n) { v.insert(v.begin(), n); }
+
-	
 //	T* memPtr() { return &*(v.begin()); }
 	T* memPtr() { return &v[0]; }
 

src/jrd/pag.h

@@ -126,7 +126,7 @@ public:
 
 	~PageManager()
 	{
-		for (int i = pageSpaces.getCount() - 1; i >= 0; --i)
+		for (size_t i = pageSpaces.getCount() - 1; i >= 0; --i)
 		{
 			PageSpace* pageSpace = pageSpaces[i];
 			pageSpaces.remove(i);