Changeset 20314

Timestamp:

06/21/07 15:02:13 (1 year ago)

Author:

patrick

Message:

We do not support Visual C++ 7.0 anymore, so we can (finally) remove the
workaround for a bug in that version of the compiler that required two
implementations of member template specialization for getProperty<T>().

Files:

• juggler/branches/2.2/modules/jackal/config/jccl/Config/ConfigElement.h (modified) (4 diffs)

juggler/branches/2.2/modules/jackal/config/jccl/Config/ConfigElement.h

@@ -176 +176 @@
-   }
-
-   // Specializations of getProperty<T> placed inline for Visual Studio 7.
-   // MIPSpro and GCC do not handle this.  They get out-of-line
-   // specializations, found below.
-#if defined(_MSC_VER) && _MSC_VER == 1300
-   template<>
-   std::string getProperty<std::string>(const std::string& prop, int ind) const
-   {
-      std::string prop_string = getPropertyString(prop,ind);
-      return prop_string;
-   }
-
-   /**
-    * Specialization for booleans so that we can read "true" and "false" rather
-    * than "1" and "0".
-    */
-   template<>
-   bool getProperty<bool>(const std::string& prop, int ind) const
-   {
-      return getProperty_bool(prop, ind);
-   }
-
-   template<>
-   ConfigElementPtr getProperty<ConfigElementPtr>(const std::string& prop,
-                                                  int ind) const
-   {
-      return getProperty_ElementPtr(prop, ind);
-   }
-#endif /* defined(_MSC_VER) && _MSC_VER == 1300 */
-
-   /**
-    * Gets value that defaults to property 0.
@@ -213 +184 @@
-    *       index within the std::string and ConfigElementPtr specializations.
-    */
-#if defined(_MSC_VER) && _MSC_VER == 1300
-   template<class T>
-   T getProperty(const std::string& prop) const
-   {
-      return getProperty<T>(prop, 0);
-   }
-#else
-   template<class T>
-   T getProperty(const std::string& prop) const;
-#endif
-
-   /**
@@ -326 +289 @@
-};
-
-#if ! defined(_MSC_VER) || _MSC_VER > 1300
-template<>
-inline std::string ConfigElement::getProperty<std::string>(const std::string& prop, int ind) const
@@ -359 +321 @@
-   return getProperty<T>(prop, 0);
-}
-#endif /* ! defined(_MSC_VER) || _MSC_VER > 1300 */
-
-} // namespace jccl