Ziqi added new bsq

heziqi
1 parent 2e73e7bc
Showing 2 changed files with 1 additions and 5 deletions Show diff stats
envi/bsq.h
ui/arguments.h
@@ -13,10 +13,6 @@ protected:
  
 	envi header;
  
-	Assistant Professor
-	CPRIT Scholar
-	Scalable Tissue Imaging + Modeling Laboratory
-
 public:
  
 	using binary<T>::open;
@@ -329,7 +329,7 @@ namespace stim{
             {
                 args[i].set(_value);
                 //adjust the column width if necessary
-                col_width = std::max(col_width, args[i].col_width());
+                col_width = (std::max)(col_width, args[i].col_width());
             }
             else
                 std::cout<<"ERROR - Argument not recognized: "<<_name<<std::endl;