ICU-491.11.3.tar.gz

[apple/icu.git] / icuSources / common / unicode / resbund.h

diff --git a/icuSources/common/unicode/resbund.h b/icuSources/common/unicode/resbund.h
index ec0e620b792f1555c38fc0b6fd2d1fb28875d4a5..86e38773316390ef575bd337445a4010096dc030 100644 (file)
--- a/icuSources/common/unicode/resbund.h
+++ b/icuSources/common/unicode/resbund.h
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
-*   Copyright (C) 1996-2005, International Business Machines Corporation
+*   Copyright (C) 1996-2011, International Business Machines Corporation
 *   and others.  All Rights Reserved.
 *
 ******************************************************************************
@@ -66,9 +66,9 @@ U_NAMESPACE_BEGIN
  * locale and then ask it for individual resources.
  * <P>
  * Resource bundles in ICU4C are currently defined using text files which conform to the following
- * <a href="http://dev.icu-project.org/cgi-bin/viewcvs.cgi/~checkout~/icuhtml/design/bnf_rb.txt">BNF definition</a>.
+ * <a href="http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt">BNF definition</a>.
  * More on resource bundle concepts and syntax can be found in the
- * <a href="http://icu.sourceforge.net/userguide/ResourceManagement.html">Users Guide</a>.
+ * <a href="http://icu-project.org/userguide/ResourceManagement.html">Users Guide</a>.
  * <P>
  *
  * The ResourceBundle class is not suitable for subclassing.
@@ -409,6 +409,7 @@ public:
       getStringEx(const char* key,
                   UErrorCode& status) const;
 
+#ifndef U_HIDE_DEPRECATED_API
     /**
      * Return the version number associated with this ResourceBundle as a string. Please
      * use getVersion, as this method is going to be deprecated.
@@ -420,6 +421,7 @@ public:
      */
     const char*
       getVersionNumber(void) const;
+#endif  /* U_HIDE_DEPRECATED_API */
 
     /**
      * Return the version number associated with this ResourceBundle as a UVersionInfo array.
@@ -431,6 +433,7 @@ public:
     void
       getVersion(UVersionInfo versionInfo) const;
 
+#ifndef U_HIDE_DEPRECATED_API
     /**
      * Return the Locale associated with this ResourceBundle.
      *
@@ -439,6 +442,7 @@ public:
      */
     const Locale&
       getLocale(void) const;
+#endif  /* U_HIDE_DEPRECATED_API */
 
     /**
      * Return the Locale associated with this ResourceBundle.
@@ -452,12 +456,14 @@ public:
      */
     const Locale
       getLocale(ULocDataLocaleType type, UErrorCode &status) const;
+#ifndef U_HIDE_INTERNAL_API
     /**
      * This API implements multilevel fallback
      * @internal
      */
     ResourceBundle
         getWithFallback(const char* key, UErrorCode& status);
+#endif  /* U_HIDE_INTERNAL_API */
     /**
      * ICU "poor man's RTTI", returns a UClassID for the actual class.
      *