fixed some compilation errors after the merge

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1021 f169173b-cf89-36c8-b27e-44dbe73f0c83

utilite/include/rtabmap/utilite/UConversion.h

@@ -50,7 +50,6 @@
  */
 std::string UTILITE_EXP uReplaceChar(const std::string & str, char before, char after);
 
-
 /**
  * Replace old characters in a string with the specified string.
  * Example :
@@ -67,7 +66,6 @@ std::string UTILITE_EXP uReplaceChar(const std::string & str, char before, char
  */
 std::string UTILITE_EXP uReplaceChar(const std::string & str, char before, const std::string & after);
 
-
 /**
  * Transform characters from a string to upper case.
  * Example :
@@ -243,13 +241,13 @@ std::string UTILITE_EXP uFormat (const char *fmt, ...);
  * Convert multi-byte string to unicode (wide-char) string.
  * Note that returned whar_t * must be deleted : delete [] wText;
  */
-wchar_t * UTILITE_EXP createWCharFromChar(const char * text);
+UTILITE_EXP wchar_t * createWCharFromChar(const char * text);
 
 /**
  * Convert unicode (wide-char) string to multi-byte string.
  * Note that returned char * must be deleted : delete [] text;
  */
-char * UTILITE_EXP createCharFromWChar(const wchar_t * wText);
+UTILITE_EXP char * createCharFromWChar(const wchar_t * wText);
 #endif
 
 #endif /* UCONVERSION_H */

utilite/include/rtabmap/utilite/ULogger.h

@@ -43,7 +43,7 @@
 */
 
 /*
- * Convenient macros for logging...
+ * Convenient macros for logging...
  */
 #define ULOGGER_LOG(level, ...) ULogger::write(level, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
 
@@ -243,7 +243,7 @@ public:
      * Logger levels, from lowest severity to highest:
      * @code
      * kDebug, kInfo, kWarning, kError, kFatal
-     * @endcode
+     * @endcode
      */
     enum Level{kDebug, kInfo, kWarning, kError, kFatal};
 
@@ -347,7 +347,7 @@ public:
 	static ULogger::Level eventLevel() {return eventLevel_;}
 
     /**
-     * Reset to default parameters.
+     * Reset to default parameters.
      */
     static void reset();
 
@@ -456,6 +456,7 @@ private:
      * @param arg the variable arguments
      */
     virtual void _write(const char* msg, va_list arg) {} // Do nothing by default
+    virtual void _writeStr(const char* msg) {} // Do nothing by default
 
 private:
     /*

utilite/include/rtabmap/utilite/UStl.h

@@ -67,7 +67,7 @@ inline std::vector<K> uKeys(const std::multimap<K, V> & mm)
 {
 	std::vector<K> v(mm.size());
 	int i=0;
-	for(typename std::map<K, V>::const_iterator iter = mm.begin(); iter!=mm.end(); ++iter)
+	for(typename std::multimap<K, V>::const_iterator iter = mm.begin(); iter!=mm.end(); ++iter)
 	{
 		v[i++] = iter->first;
 	}
@@ -83,7 +83,7 @@ template<class K, class V>
 inline std::list<K> uKeysList(const std::multimap<K, V> & mm)
 {
 	std::list<K> l;
-	for(typename std::map<K, V>::const_iterator iter = mm.begin(); iter!=mm.end(); ++iter)
+	for(typename std::multimap<K, V>::const_iterator iter = mm.begin(); iter!=mm.end(); ++iter)
 	{
 		l.push_back(iter->first);
 	}
@@ -100,7 +100,7 @@ inline std::vector<V> uValues(const std::multimap<K, V> & mm)
 {
 	std::vector<V> v(mm.size());
 	int i=0;
-	for(typename std::map<K, V>::const_iterator iter = mm.begin(); iter!=mm.end(); ++iter)
+	for(typename std::multimap<K, V>::const_iterator iter = mm.begin(); iter!=mm.end(); ++iter)
 	{
 		v[i++] = iter->second;
 	}
@@ -116,7 +116,7 @@ template<class K, class V>
 inline std::list<V> uValuesList(const std::multimap<K, V> & mm)
 {
 	std::list<V> l;
-	for(typename std::map<K, V>::const_iterator iter = mm.begin(); iter!=mm.end(); ++iter)
+	for(typename std::multimap<K, V>::const_iterator iter = mm.begin(); iter!=mm.end(); ++iter)
 	{
 		l.push_back(iter->second);
 	}

utilite/include/rtabmap/utilite/UTimer.h

@@ -20,7 +20,7 @@
 #ifndef UTIMER_H
 #define UTIMER_H
 
-#include "UtiLiteExp.h" // DLL export/import defines
+#include "rtabmap/utilite/UtiLiteExp.h" // DLL export/import defines
 
 #ifdef WIN32
 #include <windows.h>

utilite/include/rtabmap/utilite/UtiLiteExp.h

@@ -21,14 +21,14 @@
 #define UTILITEEXP_H
 
 /**
- * Used mainly on Windows for dynamic linked libraries (dll).
- */
+ * Used mainly on Windows for dynamic linked libraries (dll).
+ */
 #if defined(_WIN32)
-  #if defined(utilite_EXPORTS) || defined(utilite_qt_EXPORTS) || defined(utilite_audio_EXPORTS) || defined(utilite_cv_EXPORTS) || defined(utilite_cvqt_EXPORTS)
+  #if defined(rtabmap_utilite_EXPORTS)
     #define UTILITE_EXP   __declspec( dllexport )
   #else
     #define UTILITE_EXP   __declspec( dllimport )
-  #endif
+  #endif
 #else
   #define UTILITE_EXP
 #endif
@@ -44,4 +44,3 @@
 
 #endif
 
-