Skip to content

Commit 48e2e48

Browse files
committed
Use NULL rather than nullptr, private default (undefined) constructor
1 parent 5d9e05a commit 48e2e48

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tinyformat.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -488,9 +488,9 @@ class FormatArg
488488
{
489489
public:
490490
FormatArg()
491-
: m_value(nullptr),
492-
m_formatImpl(nullptr),
493-
m_toIntImpl(nullptr)
491+
: m_value(NULL),
492+
m_formatImpl(NULL),
493+
m_toIntImpl(NULL)
494494
{ }
495495

496496
template<typename T>
@@ -847,14 +847,14 @@ inline void formatImpl(std::ostream& out, const char* fmt,
847847
class FormatList
848848
{
849849
public:
850-
FormatList() = delete;
851850
FormatList(detail::FormatArg* formatters, int N)
852851
: m_formatters(formatters), m_N(N) { }
853852

854853
friend void vformat(std::ostream& out, const char* fmt,
855854
const FormatList& list);
856855

857856
private:
857+
FormatList();
858858
const detail::FormatArg* m_formatters;
859859
int m_N;
860860
};

0 commit comments

Comments
 (0)