From 8eba21e0d599bb9dd04a804d99c19b18db340cf0 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Fri, 23 Jul 2004 08:50:05 +0000
Subject: [PATCH] Quelques warnings en moins (typename et inline).

---
 alliance/src/nero/src/MDRGrid.cpp | 14 +++++++-------
 alliance/src/nero/src/MDefs.h     |  4 ++--
 alliance/src/nero/src/USys.cpp    |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/alliance/src/nero/src/MDRGrid.cpp b/alliance/src/nero/src/MDRGrid.cpp
index 6d60c85f..7410383a 100644
--- a/alliance/src/nero/src/MDRGrid.cpp
+++ b/alliance/src/nero/src/MDRGrid.cpp
@@ -1,7 +1,7 @@
 
 // -*- C++ -*-
 //
-// $Id: MDRGrid.cpp,v 1.3 2002/10/29 18:46:03 jpc Exp $
+// $Id: MDRGrid.cpp,v 1.4 2004/07/23 08:50:04 jpc Exp $
 //
 //  /----------------------------------------------------------------\ 
 //  |                                                                |
@@ -429,8 +429,8 @@ int  CDRGrid::dz (int index, int d)
 template<class __CNode__>
 TMatrix<__CNode__>::_CHollow::~_CHollow (void)
 {
-    _CRow::iterator  itRow;
-  _CLayer::iterator  itLayer;
+  typename   _CRow::iterator  itRow;
+  typename _CLayer::iterator  itLayer;
 
 
   for (itLayer  = nodes.begin ();
@@ -451,8 +451,8 @@ TMatrix<__CNode__>::_CHollow::~_CHollow (void)
 template<class __CNode__>
 __CNode__ &TMatrix<__CNode__>::_CHollow::add (int x, int y)
 {
-    _CRow::iterator  itRow;
-  _CLayer::iterator  itLayer;
+  typename   _CRow::iterator  itRow;
+  typename _CLayer::iterator  itLayer;
 
 
   itLayer = nodes.find (x);
@@ -473,8 +473,8 @@ __CNode__ &TMatrix<__CNode__>::_CHollow::add (int x, int y)
 template<class __CNode__>
 __CNode__ *TMatrix<__CNode__>::_CHollow::get (int x, int y)
 {
-    _CRow::iterator  itRow;
-  _CLayer::iterator  itLayer;
+  typename   _CRow::iterator  itRow;
+  typename _CLayer::iterator  itLayer;
 
 
   itLayer = nodes.find (x);
diff --git a/alliance/src/nero/src/MDefs.h b/alliance/src/nero/src/MDefs.h
index 5e927ca6..7f1fc8a5 100644
--- a/alliance/src/nero/src/MDefs.h
+++ b/alliance/src/nero/src/MDefs.h
@@ -1,7 +1,7 @@
 
 // -*- C++ -*-
 //
-// $Id: MDefs.h,v 1.5 2002/11/04 14:43:08 jpc Exp $
+// $Id: MDefs.h,v 1.6 2004/07/23 08:50:05 jpc Exp $
 //
 // /-----------------------------------------------------------------\ 
 // |                                                                 |
@@ -173,7 +173,7 @@
     // Matrix hollow level class ---------------------------------
 
     public: struct _CHollow {
- 
+
       typedef map<int, __CNode__*>  _CRow;
       typedef map<int, _CRow>       _CLayer;
 
diff --git a/alliance/src/nero/src/USys.cpp b/alliance/src/nero/src/USys.cpp
index 19cf28dd..c998114c 100644
--- a/alliance/src/nero/src/USys.cpp
+++ b/alliance/src/nero/src/USys.cpp
@@ -1,7 +1,7 @@
 
 // -*- C++ -*-
 //
-// $Id: USys.cpp,v 1.2 2002/10/17 21:57:27 jpc Exp $
+// $Id: USys.cpp,v 1.3 2004/07/23 08:50:05 jpc Exp $
 //
 //  /----------------------------------------------------------------\ 
 //  |                                                                |
@@ -177,7 +177,7 @@ CHeader CHeader::operator() (string m)
 // -------------------------------------------------------------------
 // Function (friend)  :  "operator<<()".
 
-inline ostream &operator<< (ostream &o, const CHeader &self)
+ostream &operator<< (ostream &o, const CHeader &self)
 {
   o << self._header;
   if (self._message.size ())