Fix name collisions

[satune.git] / src / Tuner / searchtuner.h

diff --git a/src/Tuner/searchtuner.h b/src/Tuner/searchtuner.h
index b410d01bc4725a3c968326b874f602a150879180..862faf690c45ad6b1f29cfd4d14dce95638b876f 100644 (file)
--- a/src/Tuner/searchtuner.h
+++ b/src/Tuner/searchtuner.h
@@ -28,7 +28,7 @@ class TunableSetting {
 unsigned int tunableSettingHash(TunableSetting *setting);
 bool tunableSettingEquals(TunableSetting *setting1, TunableSetting *setting2);
 
-typedef HashSet<TunableSetting *, uintptr_t, 4, tunableSettingHash, tunableSettingEquals> HashSetTunableSetting;
+typedef Hashset<TunableSetting *, uintptr_t, 4, tunableSettingHash, tunableSettingEquals> HashsetTunableSetting;
 typedef SetIterator<TunableSetting *, uintptr_t, 4, tunableSettingHash, tunableSettingEquals> SetIteratorTunableSetting;
 
 class SearchTuner : public Tuner {
@@ -48,8 +48,8 @@ class SearchTuner : public Tuner {
        /** Used Settings keeps track of settings that were actually used by
                 the example. Mutating settings may cause the Constraint Compiler
                 not to query other settings.*/
-       HashSetTunableSetting usedSettings;
+       HashsetTunableSetting usedSettings;
        /** Settings contains all settings. */
-       HashSetTunableSetting settings;
+       HashsetTunableSetting settings;
 };
 #endif