count.hh in gecoder-with-gecode-1.1.0

- old
+ new

@@ -289,11 +289,11 @@
     /// View which yields result of counting
     VZ z;
     /// Number of views which are equal and have been eliminated
     int   c;
     /// Constructor for cloning \a p
-    BaseView(Space* home, bool shr, BaseView& p);
+    BaseView(Space* home, bool shar, BaseView& p);
     /// Constructor for creation
     BaseView(Space* home, ViewArray<VX>& x, VY y, VZ z, int c);
     /// Specification for this propagator
     Reflection::ActorSpec spec(const Space* home, Reflection::VarMap& m,
                                 const Support::Symbol& name) const;
@@ -332,16 +332,16 @@
     using BaseView<VX,VY,VZ,shr>::count;
     using BaseView<VX,VY,VZ,shr>::atleast;
     using BaseView<VX,VY,VZ,shr>::atmost;
 
     /// Constructor for cloning \a p
-    EqView(Space* home, bool shr, EqView& p);
+    EqView(Space* home, bool shar, EqView& p);
   public:
     /// Constructor for creation
     EqView(Space* home, ViewArray<VX>& x, VY y, VZ z, int c);
     /// Create copy during cloning
-    virtual Actor* copy(Space* home, bool shr);
+    virtual Actor* copy(Space* home, bool shar);
     /// Perform propagation
     virtual ExecStatus propagate(Space* home, ModEventDelta med);
     /// Specification for this propagator
     virtual Reflection::ActorSpec spec(const Space* home,
                                         Reflection::VarMap& m) const;
@@ -373,16 +373,16 @@
     using BaseView<VX,VY,VZ,shr>::count;
     using BaseView<VX,VY,VZ,shr>::atleast;
     using BaseView<VX,VY,VZ,shr>::atmost;
 
     /// Constructor for cloning \a p
-    NqView(Space* home, bool shr, NqView& p);
+    NqView(Space* home, bool shar, NqView& p);
   public:
     /// Constructor for creation
     NqView(Space* home, ViewArray<VX>& x, VY y, VZ z, int c);
     /// Create copy during cloning
-    virtual Actor* copy(Space* home, bool shr);
+    virtual Actor* copy(Space* home, bool shar);
     /// Perform propagation
     virtual ExecStatus propagate(Space* home, ModEventDelta med);
     /// Specification for this propagator
     virtual Reflection::ActorSpec spec(const Space* home,
                                         Reflection::VarMap& m) const;
@@ -414,16 +414,16 @@
     using BaseView<VX,VY,VZ,shr>::count;
     using BaseView<VX,VY,VZ,shr>::atleast;
     using BaseView<VX,VY,VZ,shr>::atmost;
 
     /// Constructor for cloning \a p
-    LqView(Space* home, bool shr, LqView& p);
+    LqView(Space* home, bool shar, LqView& p);
   public:
     /// Constructor for creation
     LqView(Space* home, ViewArray<VX>& x, VY y, VZ z, int c);
     /// Create copy during cloning
-    virtual Actor* copy(Space* home, bool shr);
+    virtual Actor* copy(Space* home, bool shar);
     /// Perform propagation
     virtual ExecStatus propagate(Space* home, ModEventDelta med);
     /// Specification for this propagator
     virtual Reflection::ActorSpec spec(const Space* home,
                                         Reflection::VarMap& m) const;
@@ -455,10 +455,10 @@
     using BaseView<VX,VY,VZ,shr>::count;
     using BaseView<VX,VY,VZ,shr>::atleast;
     using BaseView<VX,VY,VZ,shr>::atmost;
 
     /// Constructor for cloning \a p
-    GqView(Space* home, bool shr, GqView& p);
+    GqView(Space* home, bool share, GqView& p);
   public:
     /// Constructor for creation
     GqView(Space* home, ViewArray<VX>& x, VY y, VZ z, int c);
     /// Create copy during cloning
     virtual Actor* copy(Space* home, bool share);