logging: Remove std::string from internal API

The internal logging API is used by the CUDA processor.

For CUDA 6.5 and -DENABLE_CXX11=ON, the cuda object is compiled
with C++98 and other objects with C++11. Thus remove std::string
for being incompatible ABI across C++98 and C++11.

Author: xlz

include/internal/libfreenect2/logging.h

@@ -57,24 +57,23 @@ class LogMessage
   std::ostringstream stream_;
 public:
   LogMessage(Logger *logger, Logger::Level level);
+  LogMessage(Logger *logger, Logger::Level level, const char *source);
   ~LogMessage();
 
   std::ostream &stream();
 };
 
-std::string getShortName(const char *func);
-
 } /* namespace libfreenect2 */
 
 #if defined(__GNUC__) || defined(__clang__)
-#define LOG_SOURCE ::libfreenect2::getShortName(__PRETTY_FUNCTION__)
+#define LOG_SOURCE __PRETTY_FUNCTION__
 #elif defined(_MSC_VER)
-#define LOG_SOURCE ::libfreenect2::getShortName(__FUNCSIG__)
+#define LOG_SOURCE __FUNCSIG__
 #else
 #define LOG_SOURCE ""
 #endif
 
-#define LOG(LEVEL) (::libfreenect2::LogMessage(::libfreenect2::getGlobalLogger(), ::libfreenect2::Logger::LEVEL).stream() << "[" << LOG_SOURCE << "] ")
+#define LOG(LEVEL) (::libfreenect2::LogMessage(::libfreenect2::getGlobalLogger(), ::libfreenect2::Logger::LEVEL, LOG_SOURCE).stream())
 #define LOG_DEBUG LOG(Debug)
 #define LOG_INFO LOG(Info)
 #define LOG_WARNING LOG(Warning)

src/logging.cpp

@@ -131,6 +131,28 @@ LogMessage::LogMessage(Logger *logger, Logger::Level level) : logger_(logger), l
 
 }
 
+std::string getShortName(const char *func)
+{
+  std::string src(func);
+  size_t end = src.rfind('(');
+  if (end == std::string::npos)
+    end = src.size();
+  size_t begin = 1 + src.rfind(' ', end);
+  size_t first_ns = src.find("::", begin);
+  if (first_ns != std::string::npos)
+    begin = first_ns + 2;
+  size_t last_ns = src.rfind("::", end);
+  if (last_ns != std::string::npos)
+    end = last_ns;
+  return src.substr(begin, end - begin);
+}
+
+LogMessage::LogMessage(Logger *logger, Logger::Level level, const char *source):
+  logger_(logger), level_(level)
+{
+  stream_ << "[" << getShortName(source) << "] ";
+}
+
 LogMessage::~LogMessage()
 {
   if(logger_ != 0 && stream_.good())
@@ -254,20 +276,4 @@ std::ostream &WithPerfLogging::stopTiming(std::ostream &stream)
   return impl_->stop(stream);
 }
 
-std::string getShortName(const char *func)
-{
-  std::string src(func);
-  size_t end = src.rfind('(');
-  if (end == std::string::npos)
-    end = src.size();
-  size_t begin = 1 + src.rfind(' ', end);
-  size_t first_ns = src.find("::", begin);
-  if (first_ns != std::string::npos)
-    begin = first_ns + 2;
-  size_t last_ns = src.rfind("::", end);
-  if (last_ns != std::string::npos)
-    end = last_ns;
-  return src.substr(begin, end - begin);
-}
-
 } /* namespace libfreenect2 */