From 95e40dc4766a5448c865f47e3c0176639d5d40b9 Mon Sep 17 00:00:00 2001
From: Oliver Bock <oliver.bock@aei.mpg.de>
Date: Wed, 27 May 2009 15:20:34 +0200
Subject: [PATCH] Fixed remaining type issues
---
src/framework/ResourceFactory.cpp | 4 ++--
src/framework/ResourceFactory.h | 2 +-
src/orc/ResourceCompiler.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/framework/ResourceFactory.cpp b/src/framework/ResourceFactory.cpp
index 9d395aa..0511878 100644
--- a/src/framework/ResourceFactory.cpp
+++ b/src/framework/ResourceFactory.cpp
@@ -23,10 +23,10 @@
ResourceFactory::ResourceFactory()
{
// determine number of resources
- int resourceCount = c_ResourceIndex[0][0];
+ size_t resourceCount = c_ResourceIndex[0][0];
// import each resource into factory cache
- for(int i = 0; i < resourceCount; ++i) {
+ for(size_t i = 0; i < resourceCount; ++i) {
// prepare temporary buffer
size_t resourceSize = c_ResourceIndex[i+1][1];
diff --git a/src/framework/ResourceFactory.h b/src/framework/ResourceFactory.h
index 19df1e3..4fe4e3c 100644
--- a/src/framework/ResourceFactory.h
+++ b/src/framework/ResourceFactory.h
@@ -105,7 +105,7 @@ extern const string c_ResourceIdentifiers[];
* \todo Does this need to be global?
* Maybe we should wrap a class around the generated resources?
*/
-extern const unsigned int c_ResourceIndex[][2];
+extern const size_t c_ResourceIndex[][2];
/**
* \brief Declaration of the external resource storage container
diff --git a/src/orc/ResourceCompiler.cpp b/src/orc/ResourceCompiler.cpp
index 743c5a0..bab5e91 100644
--- a/src/orc/ResourceCompiler.cpp
+++ b/src/orc/ResourceCompiler.cpp
@@ -97,7 +97,7 @@ void ResourceCompiler::compile()
outputFile << endl << "};" << endl << endl;
output = resourceIndexInitializer.str();
- outputFile << "extern const unsigned size_t c_ResourceIndex[][2] = {" << endl;
+ outputFile << "extern const size_t c_ResourceIndex[][2] = {" << endl;
outputFile << output.substr(0, output.length() - 1);
outputFile << endl << "};" << endl << endl;
--
GitLab