summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkamal.locahana <kamal.locahana>2006-11-30 13:25:45 +0000
committerkamal.locahana <kamal.locahana>2006-11-30 13:25:45 +0000
commit31dec3b40ed4e4a4f75b45cacc072f37eb0690bc (patch)
treec51754a88155e231447e9ee71ecf78a05b705f77
parent30c627e407d161f3c940a6fdd6b43b2ce1ca2677 (diff)
downloadtog-pegasus-31dec3b40ed4e4a4f75b45cacc072f37eb0690bc.zip
tog-pegasus-31dec3b40ed4e4a4f75b45cacc072f37eb0690bc.tar.gz
tog-pegasus-31dec3b40ed4e4a4f75b45cacc072f37eb0690bc.tar.xz
BUG#: 5902
TITLE: Compiler Warnings DESCRIPTION: Fix for type mismatch in assignment
-rwxr-xr-xsrc/Pegasus/Common/Attribute.cpp6
-rw-r--r--src/Pegasus/Common/Buffer.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Pegasus/Common/Attribute.cpp b/src/Pegasus/Common/Attribute.cpp
index 4c26ee7..a5fbef7 100755
--- a/src/Pegasus/Common/Attribute.cpp
+++ b/src/Pegasus/Common/Attribute.cpp
@@ -27,9 +27,9 @@
// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-//==============================================================================
+//=============================================================================
//
-//%/////////////////////////////////////////////////////////////////////////////
+//%////////////////////////////////////////////////////////////////////////////
#include "Attribute.h"
@@ -71,7 +71,7 @@ PEGASUS_STD(ostream)& operator<<(
{
os << attr.getTag();
Array<String> vals = attr.getValues();
- for (int i = 0; i < vals.size(); i++)
+ for (Uint32 i = 0; i < vals.size(); i++)
{
if (i == 0)
{
diff --git a/src/Pegasus/Common/Buffer.cpp b/src/Pegasus/Common/Buffer.cpp
index 68351c2..1521ead 100644
--- a/src/Pegasus/Common/Buffer.cpp
+++ b/src/Pegasus/Common/Buffer.cpp
@@ -140,7 +140,7 @@ void Buffer::_reserve_aux(size_t cap)
_rep->size = 0;
}
else
- _rep = _reallocate(_rep, _next_pow_2(cap));
+ _rep = _reallocate(_rep, _next_pow_2( (Uint32)cap));
}
void Buffer::_append_char_aux()