From fbb03f67ec3434281b7024627790337fb9eb3502 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Thu, 25 Apr 2019 03:31:30 +0200
Subject: Fix T63528: Alembic export always showing error on macOS, even on
 success

tellp() is not valid to check if the string stream is empty. Just get the
string directly as there is no obvious efficient method to check otherwise.
---
 source/blender/alembic/intern/abc_util.cc     | 5 -----
 source/blender/alembic/intern/abc_util.h      | 5 -----
 source/blender/alembic/intern/alembic_capi.cc | 5 +++--
 3 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'source')

diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc
index 380ceff80cf..ed3ee051a44 100644
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@ -378,11 +378,6 @@ ScopeTimer::~ScopeTimer()
 
 /* ********************** */
 
-bool SimpleLogger::empty()
-{
-  return ((size_t)m_stream.tellp()) == 0ul;
-}
-
 std::string SimpleLogger::str() const
 {
   return m_stream.str();
diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h
index 44ad4bca2f7..f7f662212fd 100644
--- a/source/blender/alembic/intern/abc_util.h
+++ b/source/blender/alembic/intern/abc_util.h
@@ -209,11 +209,6 @@ class SimpleLogger {
   std::ostringstream m_stream;
 
  public:
-  /**
-   * Check whether or not the SimpleLogger's stream is empty.
-   */
-  bool empty();
-
   /**
    * Return a copy of the string contained in the SimpleLogger's stream.
    */
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index aac7a7f2d82..3ff3fbe2001 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -290,8 +290,9 @@ static void export_endjob(void *customdata)
     BLI_delete(data->filename, false, false);
   }
 
-  if (!data->settings.logger.empty()) {
-    std::cerr << data->settings.logger;
+  std::string log = data->settings.logger.str();
+  if (!log.empty()) {
+    std::cerr << log;
     WM_report(RPT_ERROR, "Errors occurred during the export, look in the console to know more...");
   }
 
-- 
cgit v1.2.3