AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Made logging functions header only.

Browse Source
This commit is contained in:
David Williams 2015-02-06 21:13:12 +01:00
parent 4325ffabc4
commit 07f1593561
3 changed files with 10 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/PolyVoxCore/CMakeLists.txt
View File

@ -83,7 +83,7 @@ SET(CORE_INC_FILES
SET(IMPL_SRC_FILES SET(IMPL_SRC_FILES
#source/Impl/ErrorHandling.cpp #source/Impl/ErrorHandling.cpp
source/Impl/Logging.cpp #source/Impl/Logging.cpp
#source/Impl/MarchingCubesTables.cpp #source/Impl/MarchingCubesTables.cpp
#source/Impl/RandomUnitVectors.cpp #source/Impl/RandomUnitVectors.cpp
#source/Impl/RandomVectors.cpp #source/Impl/RandomVectors.cpp

11
library/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h
View File

@ -70,10 +70,17 @@ namespace PolyVox
namespace Impl namespace Impl
{ {
Logger*& getLoggerInstance(); inline Logger*& getLoggerInstance()
{
static Logger* s_pLogger = new DefaultLogger;
return s_pLogger;
}
} }
void setLogger(Logger* pLogger); inline void setLogger(Logger* pLogger)
{
Impl::getLoggerInstance() = pLogger;
}
} }
#ifdef POLYVOX_LOG_TRACE_ENABLED #ifdef POLYVOX_LOG_TRACE_ENABLED

43
library/PolyVoxCore/source/Impl/Logging.cpp
View File

@ -1,43 +0,0 @@
/*******************************************************************************
Copyright (c) 2005-2009 David Williams and Matthew Williams
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
*******************************************************************************/
#include "PolyVoxCore/Impl/Logging.h"
namespace PolyVox
{
namespace Impl
{
// Perhaps read this note when we want to move everything
// to the header file: http://stackoverflow.com/a/7834555
Logger*& getLoggerInstance()
{
static Logger* s_pLogger = new DefaultLogger;
return s_pLogger;
}
}
void setLogger(Logger* pLogger)
{
Impl::getLoggerInstance() = pLogger;
}
}