/*
Copyright libCellML Contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

#pragma once

#include <iostream>
#include <sstream>

namespace libcellml {

struct Debug
{
    Debug() = default;

    ~Debug()
    {
        std::cout << mSS.str() << std::endl;
    }

    Debug &operator<<(const void *p)
    {
        const void *address = static_cast<const void *>(p);
        std::ostringstream ss;
        ss << address;
        mSS << ss.str();
        return *this;
    }

    // accepts just about anything
    template<class T>
    Debug &operator<<(const T &x)
    {
        mSS << x;
        return *this;
    }

private:
    std::ostringstream mSS;
};

} // namespace libcellml

/*
Copyright libCellML Contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

#pragma once

#include <iostream>
#include <sstream>

namespace libcellml {

struct dbg
{
    dbg() = default;

    ~dbg()
    {
        std::cout << mSS.str() << std::endl;
    }

public:
    dbg &operator<<(const void *p)
    {
        const void *address = static_cast<const void *>(p);
        std::ostringstream ss;
        ss << address;
        mSS << ss.str();
        return *this;
    }

    // accepts just about anything
    template<class T>
    dbg &operator<<(const T &x)
    {
        mSS << x;
        return *this;
    }

private:
    std::ostringstream mSS;
};

} // namespace libcellml

--- 
+++ 
@@ -21,17 +21,16 @@
 
 namespace libcellml {
 
-struct dbg
+struct Debug
 {
-    dbg() = default;
+    Debug() = default;
 
-    ~dbg()
+    ~Debug()
     {
         std::cout << mSS.str() << std::endl;
     }
 
-public:
-    dbg &operator<<(const void *p)
+    Debug &operator<<(const void *p)
     {
         const void *address = static_cast<const void *>(p);
         std::ostringstream ss;
@@ -42,7 +41,7 @@
 
     // accepts just about anything
     template<class T>
-    dbg &operator<<(const T &x)
+    Debug &operator<<(const T &x)
     {
         mSS << x;
         return *this;
Rename dbg struct to Debug.
