Changeset 4893 for nanovis/branches/1.1/FlowBox.h

Timestamp:

Dec 20, 2014, 2:49:45 AM (10 years ago)

Author:

ldelgass

Message:

merge r4056 from trunk

Location:

nanovis/branches/1.1

Files:

• . (modified) (1 prop)
• FlowBox.h (modified) (2 diffs)

nanovis/branches/1.1/FlowBox.h

@@ -49 +49 @@
     int parseSwitches(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
     {
-        if (Rappture::ParseSwitches(interp, _switches, objc, objv, &_sv, 
-                                    SWITCH_DEFAULTS) < 0) {
+        if (nv::ParseSwitches(interp, _switches, objc, objv, &_sv, 
+                              SWITCH_DEFAULTS) < 0) {
             return TCL_ERROR;
         }
@@ -70 +70 @@
     std::string _name;          ///< Name of this box in the hash table.
     FlowBoxValues _sv;
-    static Rappture::SwitchSpec _switches[];
+    static SwitchSpec _switches[];
 };