# HG changeset patch
# User tonyp
# Date 1298650650 28800
# Node ID 76b97f73ee919732646a726c2bb4db20f650f952
# Parent  8bbefb9743aee88303804950081e8c9c9664c294# Parent  cf16c93393f53aa6a66bfea86e49cded0ec84dd4
Merge

diff -r 8bbefb9743ae -r 76b97f73ee91 src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Fri Feb 25 10:58:03 2011 -0500
+++ b/src/share/vm/runtime/globals.hpp	Fri Feb 25 08:17:30 2011 -0800
@@ -2667,25 +2667,6 @@
   product(bool, UseStringCache, false,                                      \
           "Enable String cache capabilities on String.java")                \
                                                                             \
-  /* byte strings */                                                        \
-  product(bool, UseCompressedStrings, false,                                \
-          "Enable byte-valued strings")                                     \
-                                                                            \
-  product(bool, SpecialStringCompress, true,                                \
-          "special version of string compress")                             \
-                                                                            \
-  product(bool, SpecialStringInflate, true,                                 \
-          "special version of string inflate")                              \
-                                                                            \
-  product(bool, SpecialStringCompareToCC, true,                             \
-          "special version of string compareToCC")                          \
-                                                                            \
-  product(bool, SpecialStringIndexOfCC, true,                               \
-          "special version of string indexOfCC")                            \
-                                                                            \
-  product(bool, SpecialStringEqualsCC, true,                                \
-          "special version of string equalsCC")                             \
-                                                                            \
   /* statistics */                                                          \
   develop(bool, CountCompiledCalls, false,                                  \
           "counts method invocations")                                      \