From: mpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 3 Dec 2014 16:16:33 +0000 (+0000)
Subject: 	* include/bits/regex_compiler.h (_S_cache_size): Multiply the
X-Git-Tag: upstream/5.3.0~3522
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f6fa3026c5db251d9bbe1563c1acb148efd052c;p=platform%2Fupstream%2Flinaro-gcc.git

	* include/bits/regex_compiler.h (_S_cache_size): Multiply the
	RHS of the shift-expression by _UseCache::value.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218322 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9a51913..a3de7b0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-03  Marek Polacek  <polacek@redhat.com>
+
+	* include/bits/regex_compiler.h (_S_cache_size): Multiply the
+	RHS of the shift-expression by _UseCache::value.
+
 2014-12-03  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR libstdc++/64168
diff --git a/libstdc++-v3/include/bits/regex_compiler.h b/libstdc++-v3/include/bits/regex_compiler.h
index d8880cc..66a4483 100644
--- a/libstdc++-v3/include/bits/regex_compiler.h
+++ b/libstdc++-v3/include/bits/regex_compiler.h
@@ -417,7 +417,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       typedef typename std::is_same<_CharT, char>::type _UseCache;
 
       static constexpr size_t
-      _S_cache_size() { return 1ul << (sizeof(_CharT) * __CHAR_BIT__); }
+      _S_cache_size()
+      {
+	return 1ul << (sizeof(_CharT) * __CHAR_BIT__ * int(_UseCache::value));
+      }
 
       struct _Dummy { };
       typedef typename std::conditional<_UseCache::value,