]> git.tdb.fi Git - libs/core.git/blobdiff - source/debug/backtrace.cpp
Add move semantics to Variant
[libs/core.git] / source / debug / backtrace.cpp
index 25a5e2186bc9e5869aa735ac426dac70e918c8cf..1236145aa67088d0b2aae1fd02031bd4b14068a6 100644 (file)
@@ -1,13 +1,6 @@
-/* $Id$
-
-This file is part of libmspcore
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 // Must include something to test for glibc
 #include <cstdlib>
-#if !defined(WIN32) && defined(__GLIBC__)
+#if !defined(_WIN32) && defined(__GLIBC__)
 #include <dlfcn.h>
 #include <execinfo.h>
 #endif
@@ -21,24 +14,24 @@ namespace Debug {
 
 Backtrace Backtrace::create()
 {
-#if !defined(WIN32) && defined(__GLIBC__)
+#if !defined(_WIN32) && defined(__GLIBC__)
        void *addresses[50];
-       int count=::backtrace(addresses, 50);
+       int count = ::backtrace(addresses, 50);
 
        Backtrace bt;
        Dl_info dli;
        for(int i=0; i<count; ++i)
        {
                StackFrame frame;
-               frame.address=addresses[i];
+               frame.address = addresses[i];
                if(dladdr(addresses[i], &dli))
                {
-                       frame.file=dli.dli_fname;
+                       frame.file = dli.dli_fname;
                        if(dli.dli_sname)
-                               frame.symbol=demangle(dli.dli_sname);
+                               frame.symbol = demangle(dli.dli_sname);
                }
                else
-                       frame.file="<unknown>";
+                       frame.file = "<unknown>";
                bt.frames.push_back(frame);
        }
 
@@ -50,19 +43,18 @@ Backtrace Backtrace::create()
 
 ostream &operator<<(ostream &out, const Backtrace &bt)
 {
-       const list<Backtrace::StackFrame> &frames=bt.get_frames();
-       for(list<Backtrace::StackFrame>::const_iterator i=frames.begin(); i!=frames.end(); ++i)
-               out<<*i<<'\n';
+       for(const Backtrace::StackFrame &f: bt.get_frames())
+               out << f << '\n';
 
        return out;
 }
 
 ostream &operator<<(ostream &out, const Backtrace::StackFrame &sf)
 {
-       out<<sf.address;
+       out << sf.address;
        if(!sf.symbol.empty())
-               out<<" in "<<sf.symbol;
-       out<<" from "<<sf.file;
+               out << " in " << sf.symbol;
+       out << " from " << sf.file;
 
        return out;
 }