Changeset 10858

Timestamp:

05/27/11 13:27:52 (14 years ago)

Author:

tbretz

Message:

Changed the data member cnt's name -- it sometimes gave warnings using cnt locally in derived classes.

Location:

trunk/FACT++/src

Files:

• DimErrorRedirecter.cc (modified) (2 diffs)
• DimErrorRedirecter.h (modified) (1 diff)

trunk/FACT++/src/DimErrorRedirecter.cc

@@ -33 +33 @@
 using namespace std;
 
-int DimErrorRedirecter::cnt = 0;
+int DimErrorRedirecter::fDimErrorRedireterCnt = 0;
 
 // --------------------------------------------------------------------------
@@ -44 +44 @@
 DimErrorRedirecter::DimErrorRedirecter(MessageImp &imp) : fMsg(imp)
 {
-    if (cnt++)
-    {
-        fMsg.Error("ERROR - More than one instance of MyHandlers.");
-        exit(-1);
-    }
+    if (fDimErrorRedireterCnt++)
+        throw logic_error("ERROR - More than one instance of MyHandlers.");
 
     dic_disable_padding();

trunk/FACT++/src/DimErrorRedirecter.h

@@ -9 +9 @@
 {
 private:
-    static int cnt;
+    static int fDimErrorRedireterCnt;
 
     MessageImp &fMsg;