tags 456103 + patch
thank you
Hi,
Here is a patch that resolves the build failures for me. It probably
should be checked closely.
Thanks!
Barry deFreese
diff -Nur robotour-3.2.1/libRT/rtini.cpp robotour-3.2.1.new/libRT/rtini.cpp
--- robotour-3.2.1/libRT/rtini.cpp 2005-10-09 15:34:24.000000000 -0400
+++ robotour-3.2.1.new/libRT/rtini.cpp 2008-03-13 23:20:30.000000000 -0400
@@ -123,12 +123,12 @@
if(out->fail()) { delete out; return false; }
String line;
- for(StringMap<IniSection>::Iterator sects = data.begin(); sects.hasElement(); ++sects)
+ for(StringMap<IniSection>::Iterator_t sects = data.begin(); sects.hasElement(); ++sects)
{
line = "\n["; line += (*sects).getKey(); line += "]\n";
out->write(line);
- for(IniSection::Iterator opts = (*sects).getValue().begin(); opts.hasElement(); ++opts)
+ for(IniSection::Iterator_t opts = (*sects).getValue().begin(); opts.hasElement(); ++opts)
{
line = (*opts).getKey(); line += '='; line += (*opts).getValue(); line += '\n';
out->write(line);
diff -Nur robotour-3.2.1/libRT/rtini.h robotour-3.2.1.new/libRT/rtini.h
--- robotour-3.2.1/libRT/rtini.h 2005-10-09 15:34:26.000000000 -0400
+++ robotour-3.2.1.new/libRT/rtini.h 2008-03-13 23:21:14.000000000 -0400
@@ -55,7 +55,7 @@
*/
class IniFile {
public:
- typedef StringMap<IniSection>::Iterator Iterator;
+ typedef StringMap<IniSection>::Iterator_t Iterator;
/** Creates an empty IniFile. It will not contain any sections nor entries. */
IniFile();
diff -Nur robotour-3.2.1/libRT/rtmap.h robotour-3.2.1.new/libRT/rtmap.h
--- robotour-3.2.1/libRT/rtmap.h 2008-03-13 23:11:14.000000000 -0400
+++ robotour-3.2.1.new/libRT/rtmap.h 2008-03-13 23:19:57.000000000 -0400
@@ -66,7 +66,7 @@
/** The map iterator type: You can alternatively use
* Iterator<Map<K,V>::Pair>
* or Map<K,V>::Iterator (which is somewhat shorter). */
- typedef Iterator<Pair<K,V> > Iterator;
+ typedef Iterator<Pair<K,V> > Iterator_t;
/** Creates a new empty map. The map entries are sorted using the default
* <tt>stdCompare()</tt> function. */
@@ -102,7 +102,7 @@
bool remove(const K&);
/** Removes the mapping the given iterator points to.
* Moves the iterator to the next mapping of the list. */
- void remove(Iterator& iter);
+ void remove(Iterator_t& iter);
/** Clears this map by removing and deleting all entries. */
void clear();
//Pair& insert(const Pair&);
@@ -120,19 +120,19 @@
/** Returns an unmodifyable iterator to the first element of the map.
* If the map is empty, the iterator points to nothing; you can use
* Iterator::hasElement() to check this. */
- Iterator begin() const;
+ Iterator_t begin() const;
/** Returns an unmodifyable iterator to the last element of the map.
* If the map is empty, the iterator points to nothing; you can use
* Iterator::hasElement() to check this. */
- Iterator end() const;
+ Iterator_t end() const;
/** Returns a modifyable iterator to the first element of the map.
* If the map is empty, the iterator points to nothing; you can use
* Iterator::hasElement() to check this. */
- Iterator begin();
+ Iterator_t begin();
/** Returns a modifyable iterator to the last element of the map.
* If the map is empty, the iterator points to nothing; you can use
* Iterator::hasElement() to check this. */
- Iterator end();
+ Iterator_t end();
/** The pair which is defined to be no value. */
static Pair<K,V> noValue;
diff -Nur robotour-3.2.1/libRT/rtmap.templ.cpp robotour-3.2.1.new/libRT/rtmap.templ.cpp
--- robotour-3.2.1/libRT/rtmap.templ.cpp 2005-10-09 15:34:24.000000000 -0400
+++ robotour-3.2.1.new/libRT/rtmap.templ.cpp 2008-03-13 23:17:40.000000000 -0400
@@ -50,7 +50,7 @@
template<class K, class V> bool Map<K,V>::isSet(const K& key) const
{
- for(Iterator iter = begin(); iter.hasElement(); ++iter)
+ for(Iterator_t iter = begin(); iter.hasElement(); ++iter)
{
int cmp = compareFun(iter.get().getKey(), key);
if(cmp > 0) return false; // element cannot be contained in the map
@@ -61,7 +61,7 @@
template<class K, class V> const V& Map<K,V>::get(const K& key) const
{
- for(Iterator iter = begin(); iter.hasElement(); ++iter)
+ for(Iterator_t iter = begin(); iter.hasElement(); ++iter)
{
int cmp = compareFun(iter.get().getKey(), key);
if(cmp > 0) break; // element cannot be contained in the map
@@ -72,7 +72,7 @@
template<class K, class V> V& Map<K,V>::get(const K& key)
{
- for(Iterator iter = begin(); iter.hasElement(); ++iter)
+ for(Iterator_t iter = begin(); iter.hasElement(); ++iter)
{
int cmp = compareFun(iter.get().getKey(), key);
if(cmp > 0) return data.insertBefore(iter, Pair<K,V>(key, V())).getValue();
@@ -84,7 +84,7 @@
// sorts the element into the map
template<class K, class V> Pair<K,V>& Map<K,V>::put(const K& key, const V& value)
{
- for(Iterator iter = begin(); iter.hasElement(); ++iter)
+ for(Iterator_t iter = begin(); iter.hasElement(); ++iter)
{
int cmp = compareFun(iter.get().getKey(), key);
if(cmp > 0) return data.insertBefore(iter, Pair<K,V>(key, value));
@@ -98,13 +98,13 @@
template<class K, class V> void Map<K,V>::putAll(const Map<K,V>& map)
{
- for(Iterator iter = map.begin(); iter.hasElement(); ++iter)
+ for(Iterator_t iter = map.begin(); iter.hasElement(); ++iter)
put(iter.get().getKey(), iter.get().getValue());
}
template<class K, class V> bool Map<K,V>::remove(const K& key)
{
- for(Iterator iter = begin(); iter.hasElement(); ++iter)
+ for(Iterator_t iter = begin(); iter.hasElement(); ++iter)
{
int cmp = compareFun(iter.get().getKey(), key);
if(cmp > 0) return false;
@@ -113,7 +113,7 @@
return false;
}
-template<class K, class V> void Map<K,V>::remove(Iterator& iter)
+template<class K, class V> void Map<K,V>::remove(Iterator_t& iter)
{
data.remove(iter);
}
@@ -138,23 +138,23 @@
}
// "constant" iterators (unmodifyable)
-template<class K, class V> typename Map<K,V>::Iterator Map<K,V>::begin() const
+template<class K, class V> typename Map<K,V>::Iterator_t Map<K,V>::begin() const
{
return data.begin();
}
-template<class K, class V> typename Map<K,V>::Iterator Map<K,V>::end() const
+template<class K, class V> typename Map<K,V>::Iterator_t Map<K,V>::end() const
{
return data.end();
}
// modifyable iterators
-template<class K, class V> typename Map<K,V>::Iterator Map<K,V>::begin()
+template<class K, class V> typename Map<K,V>::Iterator_t Map<K,V>::begin()
{
return data.begin();
}
-template<class K, class V> typename Map<K,V>::Iterator Map<K,V>::end()
+template<class K, class V> typename Map<K,V>::Iterator_t Map<K,V>::end()
{
return data.end();
}
diff -Nur robotour-3.2.1/robotour/robbase.cpp robotour-3.2.1.new/robotour/robbase.cpp
--- robotour-3.2.1/robotour/robbase.cpp 2005-10-26 12:39:52.000000000 -0400
+++ robotour-3.2.1.new/robotour/robbase.cpp 2008-03-13 23:12:50.000000000 -0400
@@ -251,7 +251,7 @@
String Program::print()
{
String ret;
- for(StringMap<HeaderField>::Iterator iter = headers.begin(); iter.hasElement(); ++iter)
+ for(StringMap<HeaderField>::Iterator_t iter = headers.begin(); iter.hasElement(); ++iter)
{
HeaderField field = iter.get().getValue();
if(field.type == headerPublished) ret += "Published ";
diff -Nur robotour-3.2.1/robotour/robprofile.cpp robotour-3.2.1.new/robotour/robprofile.cpp
--- robotour-3.2.1/robotour/robprofile.cpp 2005-10-27 10:51:34.000000000 -0400
+++ robotour-3.2.1.new/robotour/robprofile.cpp 2008-03-13 23:15:28.000000000 -0400
@@ -113,7 +113,7 @@
void ProfileSupervisor::initSim(Simulation* const curSim)
{
- for(ProfileMap::Iterator it = profData.begin(); it.hasElement(); )
+ for(ProfileMap::Iterator_t it = profData.begin(); it.hasElement(); )
{
if(!isReachable((*it).getKey(), (*it).getValue().name, curSim)) {
//System::println("No longer reachable: Bank '" + (*it).getValue().name + "', clearing profile info...");
diff -Nur robotour-3.2.1/robotour/robvis.cpp robotour-3.2.1.new/robotour/robvis.cpp
--- robotour-3.2.1/robotour/robvis.cpp 2005-11-02 13:11:54.000000000 -0500
+++ robotour-3.2.1.new/robotour/robvis.cpp 2008-03-13 23:15:04.000000000 -0400
@@ -375,7 +375,7 @@
{
int oldID = nextDebugID;
//processGuiRequests(curSim);
- for(Map<int,DebugInfo>::Iterator iter = debugInfo.begin(); iter.hasElement();)
+ for(Map<int,DebugInfo>::Iterator_t iter = debugInfo.begin(); iter.hasElement();)
{
DebugInfo& di = iter.get().getValue();
bool keepDI = true; // keep the DI in the map after this iteration?
@@ -416,7 +416,7 @@
// debug requests from the old simulation are no longer relevant in the next one
RobVisFrame::guiInfo.reqDebug.clearOfType(typeid(DebugRequest));
- for(Map<int,DebugInfo>::Iterator iter = debugInfo.begin(); iter.hasElement(); iter.remove())
+ for(Map<int,DebugInfo>::Iterator_t iter = debugInfo.begin(); iter.hasElement(); iter.remove())
{
DebugInfo& di = iter.get().getValue();
di.alive = false;
@@ -456,7 +456,7 @@
void VisDebugSupervisor::handleBotError(const Bot* affectedBot, ExecReturnType type)
{
// debugInfo.find(affectedBot);
- for(Map<int,DebugInfo>::Iterator iter = debugInfo.begin(); iter.hasElement();)
+ for(Map<int,DebugInfo>::Iterator_t iter = debugInfo.begin(); iter.hasElement();)
{
if(iter.get().getValue().botID == (const void*) affectedBot)
{
diff -Nur robotour-3.2.1/robotour/robwxvis.cpp robotour-3.2.1.new/robotour/robwxvis.cpp
--- robotour-3.2.1/robotour/robwxvis.cpp 2005-10-26 13:18:04.000000000 -0400
+++ robotour-3.2.1.new/robotour/robwxvis.cpp 2008-03-13 23:13:20.000000000 -0400
@@ -137,7 +137,7 @@
playerData += Pair<String, String>("File name", tr.fileName);
- for(StringMap<Program::HeaderField>::Iterator iter = tr.headers.begin(); iter.hasElement(); ++iter)
+ for(StringMap<Program::HeaderField>::Iterator_t iter = tr.headers.begin(); iter.hasElement(); ++iter)
{
Program::HeaderField& hf = (*iter).getValue();
if(hf.type == headerPublished)
@@ -606,7 +606,7 @@
players->HandleProgramColourChange();
activeField->HandleProgramColourChange();
- for(lrt::Map<int, DebugDialog*>::Iterator it = debugDialogs.begin(); it.hasElement(); ++it)
+ for(lrt::Map<int, DebugDialog*>::Iterator_t it = debugDialogs.begin(); it.hasElement(); ++it)
(*it).getValue()->HandleProgramColourChange();
}
@@ -899,8 +899,8 @@
void RobVisFrame::OnAbout(wxCommandEvent&)
{
wxString msg;
- msg.Printf(_("RoboTour, the fast and portable RoboCom interpreter.\nVersion %s\n%s"),
- Wx::Conv(rt::getUserVersion()).c_str(),
+ msg.Printf(_("RoboTour, the fast and portable RoboCom interpreter.\nVersion %s\n%s"),
+ Wx::Conv(rt::getUserVersion()).c_str(),
Wx::Conv(rt::getAboutText()).c_str());
wxMessageBox(msg,
