Make tsync part of libSimGearCore when building shared libraries

[simgear.git] / simgear / hla / HLAObjectClass.cxx

diff --git a/simgear/hla/HLAObjectClass.cxx b/simgear/hla/HLAObjectClass.cxx
index 4b8265621be009bf81be8a7f227ffbfeceea080a..40cef871a0adc1400c48e40835a0b1dbaf8e71c3 100644 (file)
--- a/simgear/hla/HLAObjectClass.cxx
+++ b/simgear/hla/HLAObjectClass.cxx
@@ -138,22 +138,22 @@ HLAObjectClass::setAttributeUpdateType(unsigned index, HLAUpdateType updateType)
 }
 
 HLADataElement::IndexPathPair
-HLAObjectClass::getIndexPathPair(const HLADataElement::AttributePathPair& attributePathPair) const
+HLAObjectClass::getIndexPathPair(const HLADataElement::StringPathPair& stringPathPair) const
 {
-    unsigned index = getAttributeIndex(attributePathPair.first);
+    unsigned index = getAttributeIndex(stringPathPair.first);
     if (getNumAttributes() <= index) {
         SG_LOG(SG_NETWORK, SG_ALERT, "HLAObjectClass::getIndexPathPair(\""
-               << HLADataElement::toString(attributePathPair)
-               << "\"): Could not resolve attribute \"" << attributePathPair.first
+               << HLADataElement::toString(stringPathPair)
+               << "\"): Could not resolve attribute \"" << stringPathPair.first
                << "\" for object class \"" << getName() << "\"!");
     }
-    return HLADataElement::IndexPathPair(index, attributePathPair.second);
+    return HLADataElement::IndexPathPair(index, stringPathPair.second);
 }
 
 HLADataElement::IndexPathPair
 HLAObjectClass::getIndexPathPair(const std::string& path) const
 {
-    return getIndexPathPair(HLADataElement::toAttributePathPair(path));
+    return getIndexPathPair(HLADataElement::toStringPathPair(path));
 }
 
 bool