Changeset 1569 for trunk/src/STDefs.h

Timestamp:

06/29/09 12:00:27 (15 years ago)

Author:

Malte Marquarding

Message:

Fix enum problem with WeightType? enum value already defined somewhere by adding W_ prefix. ALso removed enums which are no longer in use

File:

• trunk/src/STDefs.h (modified) (2 diffs)

trunk/src/STDefs.h

@@ -34 +34 @@
 
 namespace asap {
-  enum AxisNo { BeamAxis=0,
-                IFAxis,
-                PolAxis,
-                ChanAxis,
-                nAxes};
 
   enum Instrument {UNKNOWNINST=0,
@@ -53 +48 @@
   enum FeedPolType {UNKNOWNFEED, LINEAR, CIRCULAR, N_POL};
 
-  enum WeightType {NONE=0, VAR, TSYS, TINT, TINTSYS, N_WEIGHTTYPES};
-
-  enum TableType {MEMORY=0, PERSISTENT};
-
+  enum WeightType {W_NONE=0, W_VAR, W_TSYS, W_TINT, W_TINTSYS, W_N_WEIGHTTYPES};