[Adonthell-commits] CVS: adonthell/src storage.cc,1.10,1.11

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv18967

Modified Files:
        storage.cc 
Log Message:
FIXED warnings when compiling with gcc 3.1

Index: storage.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/storage.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** storage.cc  24 Aug 2001 15:35:01 -0000      1.10
--- storage.cc  1 Jul 2002 13:53:59 -0000       1.11
***************
*** 23,27 ****
  
  #ifdef _DEBUG_
! #include <iostream.h>
  #endif
  
--- 23,27 ----
  
  #ifdef _DEBUG_
! #include <iostream>
  #endif
  
***************
*** 38,42 ****
  {
  #ifdef _DEBUG_
!     cout << "storage::set_val \"" << key << "\" = " << value << endl;
  #endif
      if (!value) data.erase (key);
--- 38,42 ----
  {
  #ifdef _DEBUG_
!     std::cout << "storage::set_val \"" << key << "\" = " << value << 
std::endl;
  #endif
      if (!value) data.erase (key);
***************
*** 52,58 ****
  #ifdef _DEBUG_
      if (data.find (key) != data.end ())
!         cout << "storage::get_val \"" << key << "\" = " << data[key] << endl;
      else
!         cout << "storage::get_val no such key \"" << key << "\"" << endl;
  #endif
      if (data.find (key) == data.end ()) return 0;
--- 52,58 ----
  #ifdef _DEBUG_
      if (data.find (key) != data.end ())
!         std::cout << "storage::get_val \"" << key << "\" = " << data[key] << 
std::endl;
      else
!         std::cout << "storage::get_val no such key \"" << key << "\"" << 
std::endl;
  #endif
      if (data.find (key) == data.end ()) return 0;
***************
*** 95,105 ****
          {
  #ifdef _DEBUG_
!             cout << "*** objects::set: key already exists: '" << key << "'\n";
!             cout << "*** container contents: ";
  
              for (j = data.begin (); j != data.end (); j++)
!             cout << "'" << (*j).first << "', ";
  
!             cout << "\n\n" << flush;
  #endif // _DEBUG_
  
--- 95,105 ----
          {
  #ifdef _DEBUG_
!             std::cout << "*** objects::set: key already exists: '" << key << 
"'\n";
!             std::cout << "*** container contents: ";
  
              for (j = data.begin (); j != data.end (); j++)
!                 std::cout << "'" << (*j).first << "', ";
  
!             std::cout << "\n\n" << flush;
  #endif // _DEBUG_
  
***************
*** 122,127 ****
  
  #ifdef _DEBUG_
!     cout << "*** objects::get: key does not exist: '" << key << "'\n";
!     cout << "*** container contents: ";
  
      for (j = data.begin (); j != data.end (); j++)
--- 122,127 ----
  
  #ifdef _DEBUG_
!     std::cout << "*** objects::get: key does not exist: '" << key << "'\n";
!     std::cout << "*** container contents: ";
  
      for (j = data.begin (); j != data.end (); j++)