From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Thu, 3 Mar 2011 14:33:13 +0000 (+0000)
Subject: bbAlways vs Always (to avoid troubles with X11 at compile time)
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e542f5cdbfc165e80003d21b2fbf0e6a69344bb0;p=bbtk.git

bbAlways vs Always (to avoid troubles with X11 at compile time)
---

diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index 5e12c26..35bda12 100644
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/03/01 14:50:28 $
-  Version:   $Revision: 1.50 $
+  Date:      $Date: 2011/03/03 14:33:13 $
+  Version:   $Revision: 1.51 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -365,14 +365,14 @@ namespace bbtk
     const std::string& p = bbmBoxProcessMode;
     if ( (p == "0") ||
 	 (p == "P") || (p == "p") ||
-	 (p == "Pipeline") || (p == "pipeline") ) return BlackBox::Pipeline;
+	 (p == "Pipeline") || (p == "pipeline") ) return bbPipeline;
     if ( (p == "1") ||
 	 (p == "A") || (p == "a") ||
-	 (p == "Always") || (p == "always") ) return BlackBox::Always;
+	 (p == "Always") || (p == "always") ) return bbAlways;
     if ( (p == "2") ||
 	 (p == "R") || (p == "r") ||
 	 (p == "Reactive") || (p == "reactive") ) 
-		return BlackBox::Reactive;
+		return bbReactive;
     /*
     if ( (p == "3") ||
 	 (p == "F") || (p == "f") ||
diff --git a/kernel/src/bbtkBlackBox.h b/kernel/src/bbtkBlackBox.h
index 9b1775e..939b5f8 100644
--- a/kernel/src/bbtkBlackBox.h
+++ b/kernel/src/bbtkBlackBox.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2011/03/01 14:50:28 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2011/03/03 14:33:13 $
+  Version:   $Revision: 1.32 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -296,9 +296,9 @@ namespace bbtk
  
     typedef enum 
      {
-      Pipeline,
-      Always,
-      Reactive
+      bbPipeline,
+      bbAlways,
+      bbReactive
      }
     BoxProcessModeValue;