ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/selection/TokenMap.hpp
(Generate patch)

Comparing trunk/src/selection/TokenMap.hpp (file contents):
Revision 281 by tim, Wed Feb 2 23:13:11 2005 UTC vs.
Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# Line 42 | Line 42
42   #ifndef SELECTION_TOKENMAP_HPP
43   #define SELECTION_TOKENMAP_HPP
44  
45 < #include "selection/Token.hpp"
45 > #include "selection/SelectionToken.hpp"
46  
47   namespace oopse {
48  
49  
50 < class TokenMap{
51 <    public:
52 <        static TokenMap* getInstance(){
53 <            if (instance_ == NULL) {
54 <                instance_ = new TokenMap();
55 <            }
50 >  class TokenMap{
51 >  public:
52 >    typedef std::map<std::string, Token> TokenMapType;
53 >    static TokenMap* getInstance(){
54 >      if (instance_ == NULL) {
55 >        instance_ = new TokenMap();
56 >      }
57  
58 <            return instance_;
59 <        }
58 >      return instance_;
59 >    }
60  
61 <        Token* getToken(const std::string& ident);
61 >    Token* getToken(const std::string& ident);
62          
63 <    private:
63 >  private:
64          
65 <        TokenMap();
65 >    TokenMap();
66          
67 <        static TokenMap* instance_;
67 >    static TokenMap* instance_;
68  
69 <        std::map<std::string, Token> tokenMap_;        
69 >    TokenMapType tokenMap_;        
70          
71 < };
71 >  };
72  
73   }
74   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines