Fix some review findings.
parent
cd9cb50eaf
commit
f383ec0797
|
@ -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.
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
---------------------------------------------------------------------------
|
---------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/** @file StdOStreamLogStream.h
|
||||||
|
* @brief Implementation of StdOStreamLogStream
|
||||||
|
*/
|
||||||
|
|
||||||
#ifndef AI_STROSTREAMLOGSTREAM_H_INC
|
#ifndef AI_STROSTREAMLOGSTREAM_H_INC
|
||||||
#define AI_STROSTREAMLOGSTREAM_H_INC
|
#define AI_STROSTREAMLOGSTREAM_H_INC
|
||||||
|
|
||||||
|
@ -50,8 +55,7 @@ namespace Assimp {
|
||||||
/** @class StdOStreamLogStream
|
/** @class StdOStreamLogStream
|
||||||
* @brief Logs into a std::ostream
|
* @brief Logs into a std::ostream
|
||||||
*/
|
*/
|
||||||
class StdOStreamLogStream : public LogStream
|
class StdOStreamLogStream : public LogStream {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
/** @brief Construction from an existing std::ostream
|
/** @brief Construction from an existing std::ostream
|
||||||
* @param _ostream Output stream to be used
|
* @param _ostream Output stream to be used
|
||||||
|
@ -63,30 +67,33 @@ public:
|
||||||
|
|
||||||
/** @brief Writer */
|
/** @brief Writer */
|
||||||
void write(const char* message);
|
void write(const char* message);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::ostream& ostream;
|
std::ostream& mOstream;
|
||||||
};
|
};
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Default constructor
|
// Default constructor
|
||||||
inline StdOStreamLogStream::StdOStreamLogStream(std::ostream& _ostream)
|
inline StdOStreamLogStream::StdOStreamLogStream(std::ostream& _ostream)
|
||||||
: ostream (_ostream)
|
: mOstream (_ostream){
|
||||||
{}
|
// empty
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
// Default constructor
|
|
||||||
inline StdOStreamLogStream::~StdOStreamLogStream()
|
|
||||||
{}
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
// Write method
|
|
||||||
inline void StdOStreamLogStream::write(const char* message)
|
|
||||||
{
|
|
||||||
ostream << message;
|
|
||||||
ostream.flush();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
// Default constructor
|
||||||
|
inline StdOStreamLogStream::~StdOStreamLogStream() {
|
||||||
|
// empty
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Write method
|
||||||
|
inline void StdOStreamLogStream::write(const char* message) {
|
||||||
|
mOstream << message;
|
||||||
|
mOstream.flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
} // Namespace Assimp
|
} // Namespace Assimp
|
||||||
|
|
||||||
#endif // guard
|
#endif // guard
|
||||||
|
|
|
@ -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
|
#ifndef AI_WIN32DEBUGLOGSTREAM_H_INC
|
||||||
#define AI_WIN32DEBUGLOGSTREAM_H_INC
|
#define AI_WIN32DEBUGLOGSTREAM_H_INC
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef _WIN32
|
||||||
|
|
||||||
#include <assimp/LogStream.hpp>
|
#include <assimp/LogStream.hpp>
|
||||||
#include "windows.h"
|
#include "windows.h"
|
||||||
|
@ -12,9 +56,7 @@ namespace Assimp {
|
||||||
/** @class Win32DebugLogStream
|
/** @class Win32DebugLogStream
|
||||||
* @brief Logs into the debug stream from win32.
|
* @brief Logs into the debug stream from win32.
|
||||||
*/
|
*/
|
||||||
class Win32DebugLogStream :
|
class Win32DebugLogStream : public LogStream {
|
||||||
public LogStream
|
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
/** @brief Default constructor */
|
/** @brief Default constructor */
|
||||||
Win32DebugLogStream();
|
Win32DebugLogStream();
|
||||||
|
@ -27,24 +69,25 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Default constructor
|
inline
|
||||||
inline Win32DebugLogStream::Win32DebugLogStream()
|
Win32DebugLogStream::Win32DebugLogStream(){
|
||||||
{}
|
// empty
|
||||||
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Default constructor
|
inline
|
||||||
inline Win32DebugLogStream::~Win32DebugLogStream()
|
Win32DebugLogStream::~Win32DebugLogStream(){
|
||||||
{}
|
// empty
|
||||||
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Write method
|
inline
|
||||||
inline void Win32DebugLogStream::write(const char* message)
|
void Win32DebugLogStream::write(const char* message) {
|
||||||
{
|
::OutputDebugStringA( message);
|
||||||
OutputDebugStringA( message);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
} // Namespace Assimp
|
} // Namespace Assimp
|
||||||
|
|
||||||
#endif // ! WIN32
|
#endif // ! _WIN32
|
||||||
#endif // guard
|
#endif // guard
|
||||||
|
|
Loading…
Reference in New Issue