Changeset 256 for GtkRadiant

Show
Ignore:
Timestamp:
06/19/08 06:56:48 (6 months ago)
Author:
mattn
Message:

* renamed class LoadModule? into CLoadModule because LoadModule? is already a registered function on windows
* fixed some other windows compilation problems

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • GtkRadiant/trunk/libs/traverselib.h

    r80 r256  
    5353    return *this; 
    5454  } 
     55  TraversableObserverInsertOutputIterator& operator=(const NodeSmartReference& node) 
     56  {  
     57    m_observer->insert(node); 
     58    return *this; 
     59  } 
    5560  TraversableObserverInsertOutputIterator& operator*() { return *this; } 
    5661  TraversableObserverInsertOutputIterator& operator++() { return *this; } 
    …… 
    7883    return *this; 
    7984  } 
     85  TraversableObserverEraseOutputIterator& operator=(const NodeSmartReference& node) 
     86  {  
     87    m_observer->erase(node); 
     88    return *this; 
     89  } 
    8090  TraversableObserverEraseOutputIterator& operator*() { return *this; } 
    8191  TraversableObserverEraseOutputIterator& operator++() { return *this; } 
    8292  TraversableObserverEraseOutputIterator& operator++(int) { return *this; } 
    8393}; 
    84  
    8594typedef UnsortedSet<NodeSmartReference> UnsortedNodeSet; 
    8695 
    …… 
    8897inline void nodeset_diff(const UnsortedNodeSet& self, const UnsortedNodeSet& other, scene::Traversable::Observer* observer) 
    8998{ 
    90   std::vector<NodeReference> sorted(self.begin(), self.end()); 
    91   std::vector<NodeReference> other_sorted(other.begin(), other.end()); 
     99  std::vector<NodeSmartReference> sorted(self.begin(), self.end()); 
     100  std::vector<NodeSmartReference> other_sorted(other.begin(), other.end()); 
    92101 
    93102  std::sort(sorted.begin(), sorted.end()); 

  • GtkRadiant/trunk/radiant/mainframe.cpp

    r255 r256  
    503503#include "os/dir.h" 
    504504 
    505 class LoadModule 
     505class CLoadModule 
    506506{ 
    507507  const char* m_path; 
    508508public: 
    509   LoadModule(const char* path) : m_path(path) 
     509  CLoadModule(const char* path) : m_path(path) 
    510510  { 
    511511  } 
    …… 
    533533void Radiant_loadModules(const char* path) 
    534534{ 
    535   Directory_forEach(path, MatchFileExtension<LoadModule>(c_library_extension, LoadModule(path))); 
     535  Directory_forEach(path, MatchFileExtension<CLoadModule>(c_library_extension, CLoadModule(path))); 
    536536} 
    537537