Skip to content

Commit

Permalink
Merge pull request #372 from psychocoderHPC/fix-verboseLog
Browse files Browse the repository at this point in the history
fix linker failure
  • Loading branch information
ax3l committed Apr 30, 2014
2 parents 33b1e4b + 9bae64a commit 195f06c
Showing 1 changed file with 24 additions and 21 deletions.
45 changes: 24 additions & 21 deletions src/libPMacc/include/debug/VerboseLog.hpp
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
/**
* Copyright 2013 Rene Widera
*
* This file is part of libPMacc.
*
* libPMacc is free software: you can redistribute it and/or modify
* it under the terms of of either the GNU General Public License or
* the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* libPMacc is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License and the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License
* and the GNU Lesser General Public License along with libPMacc.
* If not, see <http://www.gnu.org/licenses/>.
*/
* This file is part of libPMacc.
*
* libPMacc is free software: you can redistribute it and/or modify
* it under the terms of of either the GNU General Public License or
* the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* libPMacc is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License and the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License
* and the GNU Lesser General Public License along with libPMacc.
* If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#include <sstream>
Expand All @@ -36,13 +36,16 @@ namespace PMacc


/** get the name of a verbose lvl
*
*
* this function is defined as friend function for every log lvl
* @param dummy instance of LogClass to find name
* @return name of LogClass
*/
template<class LogClass>
std::string getLogName(const LogClass& dummy);
std::string getLogName(const LogClass& dummy)
{
return std::string("UNDEFINED_LVL");
}


namespace verboseLog_detail
Expand Down Expand Up @@ -98,7 +101,7 @@ class VerboseLog
{
typedef LogLvl<(logLvl & LogParent::log_level), LogParent> LogClass;
/* check if a bit in the mask is set
* If you get an linker error in the next two lines you have not used
* If you get an linker error in the next two lines you have not used
* DEFINE_LOGLVL makro to define a named logLvl
*/
if (logLvl & LogParent::log_level) /*compiletime check*/
Expand Down

0 comments on commit 195f06c

Please sign in to comment.