Changeset 39


Ignore:
Timestamp:
Sep 13, 2006 6:09:57 PM (13 years ago)
Author:
pbonami
Message:

Remove hash_map (non-standard c++)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/src/IpoptInterface/IpCbcColReader.hpp

    r1 r39  
    1515#include <iostream>
    1616#include <CoinHelperFunctions.hpp>
    17 #include <ext/hash_map>
     17#include <map>
     18#include <vector>
    1819
    1920/** A class for reading a .col file containing name for variable (ampl generated file).
     
    4243
    4344  /// String comparison strucutre.
    44   struct eqstr
     45  struct ltstr
    4546  {
    4647    bool operator()(const char* s1, const char* s2) const
    4748    {
    48       return strcmp(s1, s2) == 0;
     49      return strcmp(s1, s2) < 0;
    4950    }
    5051  };
    5152
    5253  /// Hash type.
    53   typedef __gnu_cxx::hash_map<const char *, int> namesHash;//, __gnu_cxx::hash <const char *>, eqstr > namesHash;
     54  //typedef __gnu_cxx::hash_map<const char *, int> namesHash;//, __gnu_cxx::hash <const char *>, eqstr > namesHash;
     55  typedef std::map< const char *, int, ltstr > namesStorage;
    5456
    5557  ///Hash map used to store the indices.
    56   namesHash varIndices_;
     58  namesStorage varIndices_;
    5759  ///Variable names.
    5860  std::vector<std::string> varNames_;
Note: See TracChangeset for help on using the changeset viewer.