Log: better type conversion

src/oatpp/Environment.cpp

@@ -248,8 +248,6 @@ void Environment::checkTypes(){
   v_uint32 vUInt32 = ~v_uint32(1);
   v_uint64 vUInt64 = ~v_uint64(1);
 
-  OATPP_LOGe("AAA", "")
-
   OATPP_ASSERT(vInt32 < 0)
   OATPP_ASSERT(vInt64 < 0)
   OATPP_ASSERT(vUInt32 > 0)

src/oatpp/async/worker/IOEventWorker_epoll.cpp

@@ -30,6 +30,7 @@
 // epoll based implementation
 
 #include "oatpp/async/Processor.hpp"
+#include "oatpp/base/Log.hpp"
 
 #include <unistd.h>
 #include <sys/epoll.h>

src/oatpp/base/Log.cpp

@@ -93,86 +93,65 @@ LogMessage& LogMessage::operator << (bool value) {
   return *this;
 }
 
-LogMessage& LogMessage::operator << (v_int8 value) {
+LogMessage& LogMessage::operator << (int value) {
   if(writeNextChunk()) {
-    m_stream.writeAsString(value);
+    m_stream.writeAsString(static_cast<v_int32>(value));
   }
   return *this;
 }
 
-LogMessage& LogMessage::operator << (v_uint8 value) {
+LogMessage& LogMessage::operator << (unsigned value) {
   if(writeNextChunk()) {
-    m_stream.writeAsString(value);
+    m_stream.writeAsString(static_cast<v_uint32>(value));
   }
   return *this;
 }
 
-LogMessage& LogMessage::operator << (v_int16 value) {
+LogMessage& LogMessage::operator << (long value) {
   if(writeNextChunk()) {
-    m_stream.writeAsString(value);
+    m_stream.writeAsString(static_cast<v_int32>(value));
   }
   return *this;
 }
 
-LogMessage& LogMessage::operator << (v_uint16 value) {
+LogMessage& LogMessage::operator << (unsigned long value) {
   if(writeNextChunk()) {
-    m_stream.writeAsString(value);
+    m_stream.writeAsString(static_cast<v_uint32>(value));
   }
   return *this;
 }
 
-LogMessage& LogMessage::operator << (v_int32 value) {
-  if(writeNextChunk()) {
-    m_stream.writeAsString(value);
-  }
-  return *this;
-}
-
-LogMessage& LogMessage::operator << (v_uint32 value) {
-  if(writeNextChunk()) {
-    m_stream.writeAsString(value);
-  }
-  return *this;
-}
-
-LogMessage& LogMessage::operator << (v_int64 value) {
-  if(writeNextChunk()) {
-    m_stream.writeAsString(value);
-  }
-  return *this;
-}
-
-LogMessage& LogMessage::operator << (v_uint64 value) {
-  if(writeNextChunk()) {
-    m_stream.writeAsString(value);
-  }
-  return *this;
-}
-
-LogMessage& LogMessage::operator << (v_buff_size value) {
+LogMessage& LogMessage::operator << (long long value) {
   if(writeNextChunk()) {
     m_stream.writeAsString(static_cast<v_int64>(value));
   }
   return *this;
 }
 
-LogMessage& LogMessage::operator << (v_buff_usize value) {
+LogMessage& LogMessage::operator << (unsigned long long value) {
   if(writeNextChunk()) {
     m_stream.writeAsString(static_cast<v_uint64>(value));
   }
   return *this;
 }
 
-LogMessage& LogMessage::operator << (v_float32 value) {
+LogMessage& LogMessage::operator << (float value) {
   if(writeNextChunk()) {
-    m_stream.writeAsString(value);
+    m_stream.writeAsString(static_cast<v_float32>(value));
   }
   return *this;
 }
 
-LogMessage& LogMessage::operator << (v_float64 value) {
+LogMessage& LogMessage::operator << (double value) {
   if(writeNextChunk()) {
-    m_stream.writeAsString(value);
+    m_stream.writeAsString(static_cast<v_float64>(value));
+  }
+  return *this;
+}
+
+LogMessage& LogMessage::operator << (long double value) {
+  if(writeNextChunk()) {
+    m_stream.writeAsString(static_cast<v_float64>(value));
   }
   return *this;
 }

src/oatpp/base/Log.hpp

@@ -53,18 +53,16 @@ public:
 
   LogMessage& operator << (const char* str);
   LogMessage& operator << (bool value);
-  LogMessage& operator << (v_int8 value);
-  LogMessage& operator << (v_uint8 value);
-  LogMessage& operator << (v_int16 value);
-  LogMessage& operator << (v_uint16 value);
-  LogMessage& operator << (v_int32 value);
-  LogMessage& operator << (v_uint32 value);
-  LogMessage& operator << (v_int64 value);
-  LogMessage& operator << (v_uint64 value);
-  LogMessage& operator << (v_buff_size value);
-  LogMessage& operator << (v_buff_usize value);
-  LogMessage& operator << (v_float32 value);
-  LogMessage& operator << (v_float64 value);
+
+  LogMessage& operator << (int value);
+  LogMessage& operator << (unsigned value);
+  LogMessage& operator << (long value);
+  LogMessage& operator << (unsigned long value);
+  LogMessage& operator << (long long value);
+  LogMessage& operator << (unsigned long long value);
+  LogMessage& operator << (float value);
+  LogMessage& operator << (double value);
+  LogMessage& operator << (long double value);
 
   LogMessage& operator << (const oatpp::String& str);
   LogMessage& operator << (const Boolean& value);

test/oatpp/async/LockTest.cpp

@@ -141,7 +141,7 @@ bool checkSymbol(char symbol, const char* data, v_buff_size size) {
       for (v_buff_size j = 0; j < NUM_SYMBOLS; j++) {
 
         if (data[i + j] != symbol) {
-          OATPP_LOGd("aaa", "j pos={}", j)
+          OATPP_LOGd("aaa", "j pos={}", static_cast<v_int64>(j))
           return false;
         }
 

test/oatpp/base/LogTest.cpp

@@ -30,16 +30,45 @@ namespace oatpp::base {
 
 void LogTest::onRun() {
 
-//  oatpp::String val = "hello";
-//  oatpp::Float64 fv;
-//
-//  LogMessage msg("{} double={}, float={}");
-//
-//  //msg << val << fv << "<end>";
-//
-//  LogMessage::log(0, TAG, msg << 1 << 2 << 3);
-//
-//  //std::cout << msg.toStdString() << std::endl;
+  {
+    LogMessage msg("{}");
+    msg << "hello";
+    OATPP_ASSERT(msg.toStdString() == "hello")
+  }
+
+  {
+    LogMessage msg("{}");
+    msg << oatpp::String("hello");
+    OATPP_ASSERT(msg.toStdString() == "hello")
+  }
+
+  {
+    LogMessage msg("{}");
+    msg << std::string("hello");
+    OATPP_ASSERT(msg.toStdString() == "hello")
+  }
+
+  {
+    LogMessage msg("{} {}");
+    msg << true << false;
+    OATPP_ASSERT(msg.toStdString() == "true false")
+  }
+
+  {
+    LogMessage msg("{} {}");
+    msg << oatpp::Boolean(true) << oatpp::Boolean(false);
+    OATPP_ASSERT(msg.toStdString() == "true false")
+  }
+
+  {
+    LogMessage msg("{} {} {} {} {} {} {} {}");
+    msg << v_int8(-8) << v_uint8(8);
+    msg << v_int16(-16) << v_uint16(16);
+    msg << v_int32(-32) << v_uint32(32);
+    msg << v_int64(-64) << v_uint64(64);
+    OATPP_ASSERT(msg.toStdString() == "-8 8 -16 16 -32 32 -64 64")
+  }
+
 
   OATPP_LOGv(TAG, "1={}, 2={}, 3={}", 1, 2, 3)
   OATPP_LOGv(TAG, "empty params")