WIP
This commit is contained in:
parent
ea55d3e6fd
commit
a745b47cf1
|
|
@ -0,0 +1,37 @@
|
|||
---
|
||||
AlignAfterOpenBracket: Align
|
||||
AllowAllArgumentsOnNextLine: 'false'
|
||||
AllowAllConstructorInitializersOnNextLine: 'false'
|
||||
AllowAllParametersOfDeclarationOnNextLine: 'false'
|
||||
AllowShortBlocksOnASingleLine: 'false'
|
||||
AllowShortCaseLabelsOnASingleLine: 'false'
|
||||
AllowShortFunctionsOnASingleLine: InlineOnly
|
||||
AllowShortIfStatementsOnASingleLine: Never
|
||||
AllowShortLambdasOnASingleLine: None
|
||||
AllowShortLoopsOnASingleLine: 'false'
|
||||
AlwaysBreakTemplateDeclarations: 'Yes'
|
||||
BinPackArguments: 'false'
|
||||
BinPackParameters: 'false'
|
||||
BreakBeforeBraces: Allman
|
||||
BreakConstructorInitializers: BeforeComma
|
||||
ColumnLimit: '120'
|
||||
Cpp11BracedListStyle: 'true'
|
||||
FixNamespaceComments: 'true'
|
||||
IncludeBlocks: Merge
|
||||
IndentCaseLabels: 'true'
|
||||
IndentWidth: '4'
|
||||
Language: Cpp
|
||||
MaxEmptyLinesToKeep: '2'
|
||||
NamespaceIndentation: Inner
|
||||
PointerAlignment: Left
|
||||
SortUsingDeclarations: 'true'
|
||||
SpaceAfterTemplateKeyword: 'false'
|
||||
SpacesInAngles: 'false'
|
||||
SpacesInCStyleCastParentheses: 'false'
|
||||
SpacesInContainerLiterals: 'false'
|
||||
SpacesInSquareBrackets: 'false'
|
||||
Standard: Cpp11
|
||||
TabWidth: '4'
|
||||
UseTab: Never
|
||||
|
||||
...
|
||||
|
|
@ -5,10 +5,10 @@
|
|||
|
||||
namespace awesome_log
|
||||
{
|
||||
class console_writer : public writer_interface
|
||||
{
|
||||
public:
|
||||
~console_writer() override;
|
||||
void log(std::string_view msg) override;
|
||||
};
|
||||
}
|
||||
class console_writer : public writer_interface
|
||||
{
|
||||
public:
|
||||
~console_writer() override;
|
||||
void log(std::string_view msg) override;
|
||||
};
|
||||
} // namespace awesome_log
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
namespace awesome_log
|
||||
{
|
||||
class writer_interface;
|
||||
class writer_interface;
|
||||
|
||||
writer_interface& get_writer();
|
||||
void set_writer(const std::shared_ptr<writer_interface>& writer);
|
||||
}
|
||||
writer_interface& get_writer();
|
||||
void set_writer(const std::shared_ptr<writer_interface>& writer);
|
||||
} // namespace awesome_log
|
||||
|
|
@ -5,10 +5,10 @@
|
|||
|
||||
namespace awesome_log
|
||||
{
|
||||
class null_writer : public writer_interface
|
||||
{
|
||||
public:
|
||||
~null_writer() override;
|
||||
void log(std::string_view msg) override;
|
||||
};
|
||||
}
|
||||
class null_writer : public writer_interface
|
||||
{
|
||||
public:
|
||||
~null_writer() override;
|
||||
void log(std::string_view msg) override;
|
||||
};
|
||||
} // namespace awesome_log
|
||||
|
|
|
|||
|
|
@ -6,22 +6,22 @@
|
|||
|
||||
namespace awesome_log
|
||||
{
|
||||
class scoped_log
|
||||
{
|
||||
public:
|
||||
scoped_log(std::string_view msg);
|
||||
~scoped_log();
|
||||
class scoped_log
|
||||
{
|
||||
public:
|
||||
scoped_log(std::string_view msg);
|
||||
~scoped_log();
|
||||
|
||||
scoped_log() = delete;
|
||||
scoped_log() = delete;
|
||||
|
||||
// No copying or moving allowed.
|
||||
scoped_log(const scoped_log&) = delete;
|
||||
scoped_log(scoped_log&&) = delete;
|
||||
scoped_log& operator=(const scoped_log&) = delete;
|
||||
scoped_log& operator=(scoped_log&&) = delete;
|
||||
// No copying or moving allowed.
|
||||
scoped_log(const scoped_log&) = delete;
|
||||
scoped_log(scoped_log&&) = delete;
|
||||
scoped_log& operator=(const scoped_log&) = delete;
|
||||
scoped_log& operator=(scoped_log&&) = delete;
|
||||
|
||||
private:
|
||||
std::string m_msg;
|
||||
int m_uncaught_exceptions;
|
||||
};
|
||||
}
|
||||
private:
|
||||
std::string m_msg;
|
||||
int m_uncaught_exceptions;
|
||||
};
|
||||
} // namespace awesome_log
|
||||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
namespace awesome_log
|
||||
{
|
||||
class writer_interface
|
||||
{
|
||||
public:
|
||||
virtual ~writer_interface() = default;
|
||||
class writer_interface
|
||||
{
|
||||
public:
|
||||
virtual ~writer_interface() = default;
|
||||
|
||||
virtual void log(std::string_view msg) = 0;
|
||||
};
|
||||
}
|
||||
virtual void log(std::string_view msg) = 0;
|
||||
};
|
||||
} // namespace awesome_log
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@ using awesome_log::writer_interface;
|
|||
|
||||
namespace
|
||||
{
|
||||
std::shared_ptr<writer_interface> g_instance;
|
||||
std::shared_ptr<writer_interface> g_instance;
|
||||
}
|
||||
|
||||
writer_interface& awesome_log::get_writer()
|
||||
{
|
||||
if(!g_instance)
|
||||
if (!g_instance)
|
||||
{
|
||||
g_instance = std::make_shared<null_writer>();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#include <awesome_log/scoped_log.hpp>
|
||||
#include <awesome_log/log.hpp>
|
||||
#include <awesome_log/scoped_log.hpp>
|
||||
#include <awesome_log/writer_interface.hpp>
|
||||
#include <sstream>
|
||||
#include <exception>
|
||||
#include <sstream>
|
||||
|
||||
using namespace awesome_log;
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ scoped_log::~scoped_log()
|
|||
|
||||
std::stringstream ss;
|
||||
ss << "< " << m_msg;
|
||||
|
||||
|
||||
if (is_stack_unwinding)
|
||||
{
|
||||
ss << " (stack unwinding)";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
class mock_writer : public awesome_log::writer_interface
|
||||
{
|
||||
public:
|
||||
public:
|
||||
~mock_writer() override = default;
|
||||
|
||||
MOCK_METHOD(void, log, (std::string_view), (override));
|
||||
|
|
|
|||
|
|
@ -1,27 +1,22 @@
|
|||
#include <gmock/gmock.h>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "mock_writer.hpp"
|
||||
#include <awesome_log/log.hpp>
|
||||
#include <awesome_log/scoped_log.hpp>
|
||||
|
||||
#include <gmock/gmock.h>
|
||||
#include <gtest/gtest.h>
|
||||
#include <memory>
|
||||
|
||||
class test_scoped_log : public ::testing::Test
|
||||
{
|
||||
public:
|
||||
public:
|
||||
void SetUp() override
|
||||
{
|
||||
m_writer = std::make_shared<mock_writer>();
|
||||
awesome_log::set_writer(m_writer);
|
||||
}
|
||||
|
||||
void TearDown() override
|
||||
{
|
||||
awesome_log::set_writer(std::shared_ptr<awesome_log::writer_interface>());
|
||||
}
|
||||
void TearDown() override { awesome_log::set_writer(std::shared_ptr<awesome_log::writer_interface>()); }
|
||||
|
||||
protected:
|
||||
protected:
|
||||
std::shared_ptr<mock_writer> m_writer;
|
||||
};
|
||||
|
||||
|
|
@ -45,7 +40,7 @@ TEST_F(test_scoped_log, log_stack_unwind)
|
|||
awesome_log::scoped_log a("log");
|
||||
throw std::runtime_error("");
|
||||
}
|
||||
catch(const std::exception& e)
|
||||
catch (const std::exception& e)
|
||||
{
|
||||
// Not doing anything
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#include <sstream>
|
||||
#include <iostream>
|
||||
#include <boost/archive/text_oarchive.hpp>
|
||||
#include <boost/archive/text_iarchive.hpp>
|
||||
#include <boost/archive/text_oarchive.hpp>
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
struct position
|
||||
{
|
||||
|
|
@ -9,23 +9,19 @@ struct position
|
|||
int y;
|
||||
|
||||
template<class Archive>
|
||||
void serialize(Archive & ar, const unsigned int /*version*/)
|
||||
void serialize(Archive& ar, const unsigned int /*version*/)
|
||||
{
|
||||
ar & x;
|
||||
ar & y;
|
||||
}
|
||||
|
||||
bool operator==(const position& rhs) const
|
||||
{
|
||||
return x == rhs.x
|
||||
&& y == rhs.y;
|
||||
}
|
||||
bool operator==(const position& rhs) const { return x == rhs.x && y == rhs.y; }
|
||||
};
|
||||
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
position myposition{.x=123, .y=456};
|
||||
position myposition{.x = 123, .y = 456};
|
||||
|
||||
std::stringstream ss;
|
||||
{
|
||||
|
|
@ -44,5 +40,4 @@ int main(int argc, char* argv[])
|
|||
{
|
||||
std::cout << "positions are the same" << std::endl;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#include <awesome_log/console_writer.hpp>
|
||||
#include <awesome_log/log.hpp>
|
||||
#include <awesome_log/scoped_log.hpp>
|
||||
#include <awesome_log/console_writer.hpp>
|
||||
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
|
||||
|
|
@ -22,7 +21,7 @@ int main(int argc, char* argv[])
|
|||
throw std::runtime_error("Let's play!");
|
||||
// ... unreachable code goes here.
|
||||
}
|
||||
catch(const std::exception& e)
|
||||
catch (const std::exception& e)
|
||||
{
|
||||
std::cout << "Caught an exception, as expected in this example" << std::endl;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue