From f383ec0797986a70af99b5e946119f1b0951baf5 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Wed, 28 Sep 2016 00:06:23 +0200
Subject: [PATCH] Fix some review findings.

---
 code/StdOStreamLogStream.h | 29 +++++++++++-------
 code/Win32DebugLogStream.h | 73 ++++++++++++++++++++++++++++++++++++----------
 2 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/code/StdOStreamLogStream.h b/code/StdOStreamLogStream.h
index 20482fe..249e304 100644
--- a/code/StdOStreamLogStream.h
+++ b/code/StdOStreamLogStream.h
@@ -38,6 +38,11 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
+
+/** @file  StdOStreamLogStream.h
+*  @brief Implementation of StdOStreamLogStream
+*/
+
 #ifndef AI_STROSTREAMLOGSTREAM_H_INC
 #define AI_STROSTREAMLOGSTREAM_H_INC
 
@@ -50,8 +55,7 @@ namespace Assimp    {
 /** @class  StdOStreamLogStream
  *  @brief  Logs into a std::ostream
  */
-class StdOStreamLogStream : public LogStream
-{
+class StdOStreamLogStream : public LogStream {
 public:
     /** @brief  Construction from an existing std::ostream
      *  @param _ostream Output stream to be used
@@ -63,30 +67,33 @@ public:
 
     /** @brief  Writer  */
     void write(const char* message);
+
 private:
-    std::ostream& ostream;
+    std::ostream& mOstream;
 };
 
 // ---------------------------------------------------------------------------
 //  Default constructor
 inline StdOStreamLogStream::StdOStreamLogStream(std::ostream& _ostream)
-    : ostream   (_ostream)
-{}
+: mOstream   (_ostream){
+    // empty
+}
 
 // ---------------------------------------------------------------------------
 //  Default constructor
-inline StdOStreamLogStream::~StdOStreamLogStream()
-{}
+inline StdOStreamLogStream::~StdOStreamLogStream() {
+    // empty
+}
 
 // ---------------------------------------------------------------------------
 //  Write method
-inline void StdOStreamLogStream::write(const char* message)
-{
-    ostream << message;
-    ostream.flush();
+inline void StdOStreamLogStream::write(const char* message) {
+    mOstream << message;
+    mOstream.flush();
 }
 
 // ---------------------------------------------------------------------------
+
 }   // Namespace Assimp
 
 #endif // guard
diff --git a/code/Win32DebugLogStream.h b/code/Win32DebugLogStream.h
index c7bd8ca..de8606e 100644
--- a/code/Win32DebugLogStream.h
+++ b/code/Win32DebugLogStream.h
@@ -1,7 +1,51 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2016, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the following
+conditions are met:
+
+* Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the
+following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+---------------------------------------------------------------------------
+*/
+
+/** @file  Win32DebugLogStream.h
+*  @brief Implementation of Win32DebugLogStream
+*/
 #ifndef AI_WIN32DEBUGLOGSTREAM_H_INC
 #define AI_WIN32DEBUGLOGSTREAM_H_INC
 
-#ifdef WIN32
+#ifdef _WIN32
 
 #include <assimp/LogStream.hpp>
 #include "windows.h"
@@ -12,9 +56,7 @@ namespace Assimp    {
 /** @class  Win32DebugLogStream
  *  @brief  Logs into the debug stream from win32.
  */
-class Win32DebugLogStream :
-    public LogStream
-{
+class Win32DebugLogStream : public LogStream {
 public:
     /** @brief  Default constructor */
     Win32DebugLogStream();
@@ -27,24 +69,25 @@ public:
 };
 
 // ---------------------------------------------------------------------------
-//  Default constructor
-inline Win32DebugLogStream::Win32DebugLogStream()
-{}
+inline 
+Win32DebugLogStream::Win32DebugLogStream(){ 
+    // empty
+}
 
 // ---------------------------------------------------------------------------
-//  Default constructor
-inline Win32DebugLogStream::~Win32DebugLogStream()
-{}
+inline 
+Win32DebugLogStream::~Win32DebugLogStream(){
+    // empty
+}
 
 // ---------------------------------------------------------------------------
-//  Write method
-inline void Win32DebugLogStream::write(const char* message)
-{
-    OutputDebugStringA( message);
+inline 
+void Win32DebugLogStream::write(const char* message) {
+    ::OutputDebugStringA( message);
 }
 
 // ---------------------------------------------------------------------------
 }   // Namespace Assimp
 
-#endif // ! WIN32
+#endif // ! _WIN32
 #endif // guard
-- 
2.7.4