[Mobies-commit] [commit] r3714 - UDM/trunk/include

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Mon May  2 13:07:55 2011
New Revision: 3714

Log:
Fix Linux build

Modified:
   UDM/trunk/include/UdmStatic.h
   UDM/trunk/include/UdmUtil.h

Modified: UDM/trunk/include/UdmStatic.h
==============================================================================
--- UDM/trunk/include/UdmStatic.h	Mon May  2 12:51:42 2011	(r3713)
+++ UDM/trunk/include/UdmStatic.h	Mon May  2 13:07:55 2011	(r3714)
@@ -69,7 +69,7 @@
 	udm_multimap<T,Z>() : std::multimap<T,Z>(){};
 	std::pair<typename std::multimap<T, Z>::iterator, bool> safe_insert(typename std::multimap<T,Z>::value_type& item)
 	{
-		std::pair<TYPENAME std::multimap<T, Z>::iterator, TYPENAME std::multimap<T, Z>::iterator> it_pair = this->equal_range(item.first);
+		TYPENAME std::pair<TYPENAME std::multimap<T, Z>::iterator, TYPENAME std::multimap<T, Z>::iterator> it_pair = this->equal_range(item.first);
 		TYPENAME std::multimap<T, Z>::iterator i = it_pair.first;
 		bool found = false;
 		while (i != it_pair.second && !found)
@@ -81,9 +81,9 @@
 		if (!found)
 		{
 			TYPENAME std::multimap<T, Z>::iterator inserted_at = insert(item);
-			return std::pair<TYPENAME multimap<T, Z>::iterator,bool> (inserted_at, true);
+			return TYPENAME std::pair<TYPENAME std::multimap<T, Z>::iterator,bool> (inserted_at, true);
 		}
-		return std::pair<TYPENAME multimap<T, Z>::iterator,bool>(this->end(), false);
+		return TYPENAME std::pair<TYPENAME std::multimap<T, Z>::iterator,bool>(this->end(), false);
 	}
 };
 

Modified: UDM/trunk/include/UdmUtil.h
==============================================================================
--- UDM/trunk/include/UdmUtil.h	Mon May  2 12:51:42 2011	(r3713)
+++ UDM/trunk/include/UdmUtil.h	Mon May  2 13:07:55 2011	(r3714)
@@ -60,7 +60,7 @@
 	}
 	template <class Container>
 	std::vector<std::string> ExtractNames(const Container& c) {
-		vector<std::string> ret;
+	        std::vector<std::string> ret;
 		std::transform(c.begin(), c.end(), back_inserter(ret), std::ptr_fun(SimpleExtractName));
 		return ret;
 	}