ShareContainer compile fixes

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

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9d796dc81d46e6c0ffed3b2f1127b8ad801018ba..fec449e83bc599b669e097bebe337a27cfb283b3 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -68,6 +68,7 @@ src/frontends/qt2/FormCharacter.C
 src/frontends/qt2/FormCopyright.C
 src/frontends/qt2/FormParagraph.C
 src/frontends/qt2/FormPrint.C
+src/frontends/qt2/FormSearch.C
 src/frontends/qt2/FormTabularCreate.C
 src/frontends/qt2/paragraphdlgimpl.C
 src/frontends/qt2/tabularcreatedlgimpl.C

diff --git a/src/ChangeLog b/src/ChangeLog
index 4085ef2491f92fc04db0d105e7037b87a12c989a..4921e9f00964b2eb12f7845800ac7a473e5c3e56 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-06  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * ShareContainer.h: define a proper ShareContainer::value_type
+       type (and use typename to please compaq cxx)
+
 2001-03-06  Lars Gullik Bjønnes  <larsbj@trylle.birdstep.com>
 
        * lyxparagraph.h: move serveral local vars to
@@ -8,7 +13,8 @@
        * paragraph.C: changes because of the above.
 
        * lyxfont.h: remove copy constructor and copy assignment. (the
-       default ones is ok), move number inside FontBits. move inlines to lyxfont.C
+       default ones is ok), move number inside FontBits. move inlines to
+       lyxfont.C 
 
        * lyxfont.C: add number to initializaton of statics, move several
        inlines here. constify several local vars. some whitespace

diff --git a/src/ShareContainer.h b/src/ShareContainer.h
index 0ca488485e4d2a1599a624ff4745febca2e80050..a4aa23fa828a34b86aa7323522ab907d7d4134a8 100644 (file)
--- a/src/ShareContainer.h
+++ b/src/ShareContainer.h
@@ -15,7 +15,9 @@ public:
        ///
        typedef std::vector<boost::shared_ptr<Share> > Params;
        ///
-       Params::value_type
+       typedef typename Params::value_type value_type;
+       ///
+       value_type
        get(Share const & ps) const {
                // First see if we already have this ps in the container
                Params::iterator it = params.begin();
@@ -24,7 +26,7 @@ public:
                        if (ps == *(*it).get())
                                break;
                }
-               Params::value_type tmp;
+               value_type tmp;
                if (it == end) {
                        // ok we don't have it so we should
                        // insert it.
@@ -44,14 +46,14 @@ public:
 private:
        ///
        struct comp {
-               int operator()(Params::value_type const & p1,
-                              Params::value_type const & p2) {
+               int operator()(value_type const & p1,
+                              value_type const & p2) {
                        return p1.use_count() < p2.use_count();
                }
        };
        ///
        struct isUnique {
-               bool operator()(Params::value_type const & p) const {
+               bool operator()(value_type const & p) const {
                        return p.unique();
                }
        };