add some missing typenames

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3886 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 6af378ef5c2362592c00f8fc0522920acb157767..eaa0d34455d62e24677fc989c722e87090095e09 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -6,6 +6,9 @@
 
 2002-04-01  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
+       * reLyX/Makefile.am (install-data-local): fix variable usage
+       (uninstall-local): ditto
+
        * CREDITS: add Claus Hindsgaul
 
 2002-03-28  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>

diff --git a/src/ChangeLog b/src/ChangeLog
index 43c6b755cec8e6dc895d8a5647458336f3d09963..36b4607739cb816e4c66363720ecf73d9df0f328 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,10 +1,14 @@
+2002-04-03  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * ShareContainer.h: add a couple of missing typenames.
+
 2002-04-02  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * lyxrc.C (getDescription): use _() correctly rather than N_().
 
 2002-03-28  Herbert Voss  <voss@lyx.org>
 
-       * lyxlength.C: compatibility stuff for < 1.1.6fix4 and 
+       * lyxlength.C: compatibility stuff for < 1.1.6fix4 and
        "old" 1.2.0 files which use c%, l%, p% t% instead of text%, ...
 
 2002-04-02  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
@@ -50,7 +54,7 @@
 2002-03-27  Herbert Voss  <voss@lyx.org>
 
        * lengthcommon.C: change c%, l%, p% t% to col%, line%, page%
-       and text% 
+       and text%
 
 2002-03-27  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 

diff --git a/src/ShareContainer.h b/src/ShareContainer.h
index 7fb74c79a0097befdf0db4f02b389507aa1a5a4c..93743898820d5ebc5f468c2c1a3891a2546e3c9d 100644 (file)
--- a/src/ShareContainer.h
+++ b/src/ShareContainer.h
@@ -27,9 +27,9 @@ public:
        value_type
        get(Share const & ps) const {
                // First see if we already have this ps in the container
-               Params::iterator it = std::find_if(params.begin(),
-                                                  params.end(),
-                                                  isEqual(ps));
+               typename Params::iterator it = std::find_if(params.begin(),
+                                                           params.end(),
+                                                           isEqual(ps));
                value_type tmp;
                if (it == params.end()) {
                        // ok we don't have it so we should
@@ -73,9 +73,9 @@ private:
            optimizaton.
        */
        void clean() const {
-               Params::iterator it = std::remove_if(params.begin(),
-                                                    params.end(),
-                                                    isUnique());
+               typename Params::iterator it = std::remove_if(params.begin(),
+                                                             params.end(),
+                                                             isUnique());
                params.erase(it, params.end());
        }
 

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index c77797edc47fd8cdf19ac4d847fc3837249c73e2..66580a885f8f2aa02cf749a83b866a018933af3b 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-03  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * FormCharacter.C (findPos): add a missing typename
+
 2002-04-02  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * FeedbackController.C:
@@ -20,7 +24,7 @@
 
        * xforms_helpers.h:
        * FormGraphics.C:  change c%, l%, p% t% to col%, line%, page%
-       and text% 
+       and text%
 
 2002-03-27  Angus Leeming  <a.leeming@ic.ac.uk>
 

diff --git a/src/frontends/xforms/FormCharacter.C b/src/frontends/xforms/FormCharacter.C
index a7758ed2b1560cee8dd7fa8591bab5e3ade730ee..371b3a91bfd4a8671cf679cdb15ebc5fd92c9e24 100644 (file)
--- a/src/frontends/xforms/FormCharacter.C
+++ b/src/frontends/xforms/FormCharacter.C
@@ -143,7 +143,8 @@ namespace {
 template<class A>
 typename vector<A>::size_type findPos(vector<A> const & vec, A const & val)
 {
-       vector<A>::const_iterator it = find(vec.begin(), vec.end(), val);
+       typename vector<A>::const_iterator it =
+               find(vec.begin(), vec.end(), val);
        if (it == vec.end())
                return 0;
        return it - vec.begin();