Changeset 10429 for trunk/FACT++/src/StateMachineImp.cc

Timestamp:

04/20/11 16:58:05 (14 years ago)

Author:

tbretz

Message:

Moved the tools function into their own namespace to get rid of problems whenlinking with root.

File:

• trunk/FACT++/src/StateMachineImp.cc (modified) (4 diffs)

trunk/FACT++/src/StateMachineImp.cc

@@ -554 +554 @@
 EventImp &StateMachineImp::AddTransition(int targetstate, const char *name, int s1, int s2, int s3, int s4, int s5)
 {
-    return AddTransition(targetstate, name, Form("%d %d %d %d %d", s1, s2, s3, s4, s5).c_str(), "");
+    return AddTransition(targetstate, name,
+                         Tools::Form("%d %d %d %d %d", s1, s2, s3, s4, s5).c_str(), "");
 }
 
@@ -586 +587 @@
 EventImp &StateMachineImp::AddTransition(int targetstate, const char *name, const char *fmt, int s1, int s2, int s3, int s4, int s5)
 {
-    return AddTransition(targetstate, name, Form("%d %d %d %d %d", s1, s2, s3, s4, s5).c_str(), fmt);
+    return AddTransition(targetstate, name,
+                         Tools::Form("%d %d %d %d %d", s1, s2, s3, s4, s5).c_str(), fmt);
 }
 
@@ -701 +703 @@
 {
     const StateNames::const_iterator i = fStateNames.find(state);
-    return i==fStateNames.end() || i->second.first.empty() ? Form("%d", state) : i->second.first;
+    return i==fStateNames.end() || i->second.first.empty() ? Tools::Form("%d", state) : i->second.first;
 }
 
@@ -737 +739 @@
 {
     const string &str = GetStateName(state);
-    if (str==Form("%d", state))
+    if (str==Tools::Form("%d", state))
         return str;
-    return str.empty() ? Form("%d", state) : (str+Form("[%d]", state));
+    return str.empty() ? Tools::Form("%d", state) : (str+Tools::Form("[%d]", state));
 }