summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2013-03-01 11:25:48 +1100
committerChris Johns <chrisj@rtems.org>2013-03-01 11:25:48 +1100
commit3b6f4dfeccdcbdf35082034992fe069c0a326a5e (patch)
treec587228a7717c7e51870c0bc66c2682874b3a369
parentfd54b1cbabf8ad545ce535e21474b50483869837 (diff)
Fix errors building on CentOS.
-rw-r--r--rld-rap.cpp8
-rw-r--r--rtems-rapper.cpp1
-rw-r--r--rtems-utils.h2
3 files changed, 8 insertions, 3 deletions
diff --git a/rld-rap.cpp b/rld-rap.cpp
index 175376e..b198017 100644
--- a/rld-rap.cpp
+++ b/rld-rap.cpp
@@ -27,6 +27,8 @@
#include "config.h"
#endif
+#include <string.h>
+
#include <algorithm>
#include <list>
#include <iomanip>
@@ -821,7 +823,7 @@ namespace rld
object::get_relocations (int sec) const
{
if ((sec < 0) || (sec >= rap_secs))
- throw rld::error ("Invalid section index '" + rld::to_string (index),
+ throw rld::error ("Invalid section index '" + rld::to_string (sec),
"rap::relocations");
return secs[sec].relocs.size ();
}
@@ -1354,7 +1356,7 @@ namespace rld
image::get_relocations (int sec) const
{
if ((sec < 0) || (sec >= rap_secs))
- throw rld::error ("Invalid section index '" + rld::to_string (index),
+ throw rld::error ("Invalid section index '" + rld::to_string (sec),
"rap::image::relocations");
uint32_t relocs = 0;
@@ -1407,7 +1409,7 @@ namespace rld
image::section_size (sections sec) const
{
if ((sec < 0) || (sec >= rap_secs))
- throw rld::error ("Invalid section index '" + rld::to_string (index),
+ throw rld::error ("Invalid section index '" + rld::to_string (sec),
"rap::image::section_size");
return sec_size[sec];
}
diff --git a/rtems-rapper.cpp b/rtems-rapper.cpp
index d643361..a0867f6 100644
--- a/rtems-rapper.cpp
+++ b/rtems-rapper.cpp
@@ -26,6 +26,7 @@
#include "config.h"
#endif
+#include <algorithm>
#include <iomanip>
#include <iostream>
#include <vector>
diff --git a/rtems-utils.h b/rtems-utils.h
index e41d7c7..9918570 100644
--- a/rtems-utils.h
+++ b/rtems-utils.h
@@ -25,6 +25,8 @@
#if !defined (_MEMORY_DUMP_H_)
#define _MEMORY_DUMP_H_
+#include <stdint.h>
+
namespace rtems
{
namespace utils