This is the mail archive of the
ecos-patches@sourceware.org
mailing list for the eCos project.
Re: uSTL Template
On Fri, Aug 21, 2009 at 04:58:38PM +0200, cetoni GmbH - Uwe Kindler wrote:
> Hi Sergei,
>
> thank you for testing.
>
> I think both patches are o.k. Could you please provide both patches with
> a changelog entry?
>
> Thank you very much.
>
> Regards, Uwe
Hello Uwe,
Done. But, IMO, that's excessive thing, instead I would ask John to
reformat a few of the sources with dos2unix (including CL) and just to
apply these things silently (i.e. without excessive changelogging). I
remember that we discussed those my tweaks with you together before a
pushing of the package on CVS (I dropped on the list in those days), and
you just forgot to apply those 2 cent tweaks. May be it's possible to
fulfil a "re-checkin" of the stuff with tweaks, clean CL and unix NLs?
Regards,
Sergei
Index: language/cxx/ustl/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/cxx/ustl/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- language/cxx/ustl/current/ChangeLog 20 Aug 2009 17:00:31 -0000 1.1
+++ language/cxx/ustl/current/ChangeLog 21 Aug 2009 15:36:56 -0000
@@ -1,5 +1,12 @@
+2009-08-21 Sergei Gavrikov <sergei.gavrikov@gmail.com>
+
+ * src/bktrace.cpp: denied an inclusion host's header <execinfo.h>
+ (eCos builds for Linux synthetic target).
+ * src/uexception.cpp:exception::read(): initialed local
+ varibale stmSize to satisfy compiler's suspicion.
+
2009-08-20 Uwe Kindler <uwe_kindler@web.de>
* Initial contribution of uSTL library
//===========================================================================
Index: language/cxx/ustl/current/src/bktrace.cpp
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/cxx/ustl/current/src/bktrace.cpp,v
retrieving revision 1.1
diff -u -5 -p -r1.1 bktrace.cpp
--- language/cxx/ustl/current/src/bktrace.cpp 20 Aug 2009 17:00:31 -0000 1.1
+++ language/cxx/ustl/current/src/bktrace.cpp 21 Aug 2009 15:36:57 -0000
@@ -4,11 +4,11 @@
// This file is free software, distributed under the MIT License.
#include "bktrace.h"
#include "sostream.h"
#include "mistream.h"
-#if linux && __GNUC__
+#if 0 // linux && __GNUC__
#include <execinfo.h>
#else
static inline int backtrace (void**, int) { return (0); }
static inline char** backtrace_symbols (void* const*, int) { return (NULL); }
#endif
Index: language/cxx/ustl/current/src/uexception.cpp
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/cxx/ustl/current/src/uexception.cpp,v
retrieving revision 1.1
diff -u -5 -p -r1.1 uexception.cpp
--- language/cxx/ustl/current/src/uexception.cpp 20 Aug 2009 17:00:31 -0000 1.1
+++ language/cxx/ustl/current/src/uexception.cpp 21 Aug 2009 15:36:57 -0000
@@ -33,11 +33,11 @@ void exception::info (string& msgbuf, co
}
/// Reads the exception from stream \p is.
void exception::read (istream& is)
{
- uint32_t stmSize;
+ uint32_t stmSize = 0;
xfmt_t fmt = xfmt_Exception;
is >> fmt >> stmSize >> m_Backtrace;
assert (fmt == m_Format && "The saved exception is of a different type.");
assert ((stmSize + 8) - exception::stream_size() <= is.remaining() && "The saved exception data is corrupt.");
m_Format = fmt;