Date: Wednesday, January 25, 2006 @ 18:27:26
  Author: marc
    Path: /cvsroot/carob/carob

Modified: include/CarobException.hpp (1.33 -> 1.34) src/CarobException.cpp
          (1.17 -> 1.18)

2nd part/cleanup following default BackTrace ctor: renamed currentBacktrace() 
to default ctor BackTrace::Backtrace()


----------------------------+
 include/CarobException.hpp |    1 -
 src/CarobException.cpp     |   14 ++++----------
 2 files changed, 4 insertions(+), 11 deletions(-)


Index: carob/include/CarobException.hpp
diff -u carob/include/CarobException.hpp:1.33 
carob/include/CarobException.hpp:1.34
--- carob/include/CarobException.hpp:1.33       Wed Jan 25 18:16:00 2006
+++ carob/include/CarobException.hpp    Wed Jan 25 18:27:26 2006
@@ -37,7 +37,6 @@
 {
 public:
   BackTrace();
-  BackTrace(size_type n) : std::vector<std::string>(n) { } ;
 };
 
 
Index: carob/src/CarobException.cpp
diff -u carob/src/CarobException.cpp:1.17 carob/src/CarobException.cpp:1.18
--- carob/src/CarobException.cpp:1.17   Wed Jan 25 18:16:00 2006
+++ carob/src/CarobException.cpp        Wed Jan 25 18:27:26 2006
@@ -35,24 +35,18 @@
 using namespace CarobNS;
 
 /** constructs the BackTrace of the current place */
-static BackTrace currentBackTrace()
+BackTrace::BackTrace()
 {
-  BackTrace bt(0);
-
 #ifdef GLIB_BACKTRACE
   void * stack_pointers[100];
   size_t size = backtrace (stack_pointers /* set it */, 100);
   char **cstrings = backtrace_symbols (stack_pointers /* use it */, size);
   for (size_t i=0; i<size; i++)
-    bt.push_back(cstrings[i]);
+    this->push_back(cstrings[i]);
   free(cstrings);
 #endif
-
-  return bt;
 }
 
-BackTrace::BackTrace() : std::vector<std::string>(currentBackTrace())
-{ };
 
 CarobException::~CarobException()
 {
@@ -80,7 +74,7 @@
   }
 }
 
-CarobException::CarobException(const DriverSocket& sock) : 
backTrace(currentBackTrace())
+CarobException::CarobException(const DriverSocket& sock)
 {
   bool hasNextException;
 
@@ -103,7 +97,7 @@
 }
 
 CarobException::CarobException(const wstring &messagePrm,
-                              CarobException* causePrm) : 
backTrace(currentBackTrace())
+                              CarobException* causePrm)
 {
   message = messagePrm;
   causePtr = causePrm;

_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits

Reply via email to