# HG changeset patch
# User rottenha
# Date 1298633396 28800
# Node ID cf16c93393f53aa6a66bfea86e49cded0ec84dd4
# Parent  a97fd181b813a5cd4c2b42a97ed1b942c35345a7# Parent  162b6246026460b3aa513d754b162176c9171d22
Merge

diff -r a97fd181b813 -r cf16c93393f5 src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Wed Feb 23 11:18:16 2011 -0800
+++ b/src/share/vm/runtime/globals.hpp	Fri Feb 25 03:29:56 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")                                      \