Commit Graph

1149 Commits

Author SHA1 Message Date
Marshall Clow e4fa0dee48 Eradicate tabs
llvm-svn: 188322
2013-08-13 22:22:40 +00:00
Marshall Clow e06dfe2ccd Update for N3657 and issue 2010
llvm-svn: 188321
2013-08-13 22:20:01 +00:00
Marshall Clow 2585835c3b Second half (map/multimap) of N3657
llvm-svn: 188320
2013-08-13 22:18:47 +00:00
Marshall Clow 72f7821cc6 Updated issues 2039, 2044, 2197, 2225, and 2231
llvm-svn: 188294
2013-08-13 17:02:42 +00:00
Marshall Clow bd9d059e6c Updated Issue 2187
llvm-svn: 188286
2013-08-13 16:23:22 +00:00
Marshall Clow e714b879df Removed 'Ready' issues from Bristol
llvm-svn: 188284
2013-08-13 16:07:51 +00:00
Marshall Clow fb9945594f Updated issues 2009 and 2074
llvm-svn: 188283
2013-08-13 16:01:28 +00:00
Marshall Clow 914993df0b Added more tests for numeric conversion error handing; Refs LWG issue 2009
llvm-svn: 188282
2013-08-13 15:52:51 +00:00
Marshall Clow 47e432c6df Fix template formatting. No, really
llvm-svn: 188277
2013-08-13 15:13:42 +00:00
Marshall Clow 6efb2bf585 escape some template specs
llvm-svn: 188276
2013-08-13 15:07:02 +00:00
Marshall Clow 873e890f44 Fix case mismatch
llvm-svn: 188275
2013-08-13 14:59:44 +00:00
Marshall Clow f77718ad1d Create a C++14 status page
llvm-svn: 188273
2013-08-13 14:58:39 +00:00
Marshall Clow 75f9aa9993 More support for N3657; tests for is_transparent
llvm-svn: 188242
2013-08-13 01:12:41 +00:00
Marshall Clow 25d3402c6a First half of support for N3657; heterogenous lookups for set/multiset
llvm-svn: 188241
2013-08-13 01:11:06 +00:00
Howard Hinnant f0544c2086 Nico Rieck: this patch series fixes visibility issues on Windows as explained in <http://lists.cs.uiuc.edu/pipermail/cfe-dev/2013-August/031214.html>.
llvm-svn: 188192
2013-08-12 18:38:34 +00:00
Howard Hinnant 6afbc442d6 Add a check for arrays of unknown bounds to is_destructible. This fixes http://llvm.org/bugs/show_bug.cgi?id=16839
llvm-svn: 188080
2013-08-09 16:53:45 +00:00
Howard Hinnant d7cda0680a Partial implementation of N3665. This paper was not voted into the C++1y draft. However I was looking at it and with some experimentation realized that I could partially implement it, and at the same time offer a performance optimization to cout. I simply added an xsputn override to the cout filebuf. The override does nothing special at all if there is a non-trivial codecvt installed. However if the codecvt returns true for always_noconv(), then this function can dump an entire string to fwrite, instead of doing it a character at a time under overflow(). This just makes sense. I stopped short of a full implementation of N3665 because in order to do so, xsputn would have to allocate a buffer when always_noconv() returned false, and I don't want to go to that expense.
llvm-svn: 188077
2013-08-09 16:25:43 +00:00
Daniel Dunbar 4a38129468 [tests] Update to use lit_config and lit package, as appropriate.
llvm-svn: 188073
2013-08-09 14:44:11 +00:00
Marshall Clow 2472b928d2 N3644 tests for map/multimap/set/multiset. Drive-by NOEXCEPT for __tree_const_iterator constructor. Fix comment typos in other tests
llvm-svn: 188019
2013-08-08 21:52:50 +00:00
Howard Hinnant 8c9742051d My previous reorganization of addressof broke -std=c++03. Thanks much to Arnold Schwaighofer for catching this. This patch also catches a few more missing addressof in <future>, thanks go to Zhihao Yuan for catching these.
llvm-svn: 187997
2013-08-08 18:38:55 +00:00
Arnold Schwaighofer 5331e3a481 Revert r187927.
Zhihao Yuan: Replace operator& with addressof in reference_wrapper constructor.

It breaks a clang bootstrap.

llvm-svn: 187959
2013-08-08 03:06:24 +00:00
Howard Hinnant 57f783da4e Update CREDITS.TXT
llvm-svn: 187936
2013-08-07 23:29:10 +00:00
Howard Hinnant 9027f5e3de Zhihao Yuan: Replace operator& with addressof in reference_wrapper constructor.
llvm-svn: 187927
2013-08-07 23:02:42 +00:00
Marshall Clow 2c1a894061 N3644 support for <unordered_set> and <unordered_map>
llvm-svn: 187915
2013-08-07 21:30:44 +00:00
Marshall Clow 36b2a3b0e5 N3644 support for vector<bool>
llvm-svn: 187911
2013-08-07 20:53:44 +00:00
Marshall Clow 798061ded6 N3644 support for vector<bool>
llvm-svn: 187910
2013-08-07 20:53:38 +00:00
Marshall Clow 07186a7d2d N3644 support for <string> and <vector>
llvm-svn: 187909
2013-08-07 20:48:48 +00:00
Howard Hinnant 303e27d8ce Correct logic bug in find optimization for vector<bool>. This fixes http://llvm.org/bugs/show_bug.cgi?id=16816
llvm-svn: 187908
2013-08-07 20:42:16 +00:00
Howard Hinnant d098713aaf War on tabs
llvm-svn: 187906
2013-08-07 19:39:48 +00:00
Howard Hinnant c5582b57c6 Rename time.duration.literals step 3
llvm-svn: 187905
2013-08-07 19:39:11 +00:00
Howard Hinnant 35e09c7ad7 Rename time.duration.literals step 2
llvm-svn: 187904
2013-08-07 19:36:50 +00:00
Howard Hinnant 453ca75d24 Rename time.duration.literals step 1
llvm-svn: 187903
2013-08-07 19:35:46 +00:00
Marshall Clow e141dc0490 Implement tests for NULL iterators for <array> re: N3644
llvm-svn: 187809
2013-08-06 17:17:13 +00:00
Marshall Clow 8fe0a3722c Implement NULL iterators for <forward_list> and <deque> re: N3644
llvm-svn: 187805
2013-08-06 16:14:36 +00:00
Marshall Clow 0c37cfd8b8 Implement NULL iterators for <list> re: N3644
llvm-svn: 187740
2013-08-05 21:23:28 +00:00
Howard Hinnant 2f51de568f debug mode for unordered_map. Also picked up a missing check and test in unordered_multimap. This wraps up debug mode for the unordered containers.
llvm-svn: 187659
2013-08-02 17:50:49 +00:00
Howard Hinnant 42a3046eef Ok, 3 major changes for debug mode in one commit:
1.  I had been detecting and trapping iterator == and \!= among iterators
    in different containers as an error.  But the trapping itself is actually
    an error.
    
    Consider:
    
    #include <iostream>
    #include <vector>
    #include <algorithm>

    template <class C>
    void
    display(const C& c)
    {
        std::cout << "{";
        bool first = true;
        for (const auto& x : c)
        {
            if (\!first)
                std::cout << ", ";
            first = false;
            std::cout << x;
        }
        std::cout << "}\n";
    }

    int
    main()
    {
        typedef std::vector<int> V;
        V v1 = {1, 3, 5};
        V v2 = {2, 4, 6};
        display(v1);
        display(v2);
        V::iterator i = std::find(v1.begin(), v1.end(), 1);
        V::iterator j = std::find(v2.begin(), v2.end(), 2);
        if (*i == *j)
            i = j;    // perfectly legal
        // ...
        if (i \!= j)   // the only way to check
            v2.push_back(*i);
        display(v1);
        display(v2);
    }

    It is legal to assign an iterator from one container to another of the
    same type.  This is required to work.  One might want to test whether or
    not such an assignment had been made.  The way one performs such a check
    is using the iterator's ==, \!= operator.  This is a logical and necessary
    function and does not constitute an error.

2.  I had a header circular dependence bug when _LIBCPP_DEBUG2 is defined.
    This caused a problem in several of the libc++ tests.
    Fixed.

3.  There is a serious problem when _LIBCPP_DEBUG2=1 at the moment in that
    std::basic_string is inoperable.  std::basic_string uses __wrap_iterator
    to implement its iterators.  __wrap_iterator has been rigged up in debug
    mode to support vector.  But string hasn't been rigged up yet.  This means
    that one gets false positives when using std::string in debug mode.  I've
    upped std::string's priority in www/debug_mode.html.

llvm-svn: 187636
2013-08-02 00:26:35 +00:00
Howard Hinnant 0be8f64c44 Nico Rieck: Currently _MSC_VER and _WIN32 are used to guard code which is
MSVC-specific, MSVCRT-specific, or Windows-specific. Because Clang can
also define _MSC_VER, and MSVCRT is not necessarily the only C runtime,
these macros should not be used interchangeably.

This patch divides all Windows-related bits into the aforementioned
categories. Two new macros are introduced:

- _LIBCPP_MSVC: Defined when compiling with MSVC. Detected using
  _MSC_VER, excluding Clang.
- _LIBCPP_MSVCRT: Defined when using the Microsoft CRT. This is the default
   when _WIN32 is defined.

This leaves _WIN32 for code using the Windows API.

This also corrects the spelling of _LIBCP_HAS_IS_BASE_OF to _LIBCPP_HAS_IS_BASE_OF.

Nico, please prepare a patch for CREDITS.TXT, thanks.

llvm-svn: 187593
2013-08-01 18:17:34 +00:00
Howard Hinnant 0f242bea10 Taking another swing at correctly optimizing fill_n.
llvm-svn: 187587
2013-08-01 17:29:28 +00:00
Howard Hinnant ce075cf1aa Constrain fill_n -> memset operations to include implicit convertibility to unsigned char. This fixes http://llvm.org/bugs/show_bug.cgi?id=16764. Also a drive-by fix on a chrono test suite bug.
llvm-svn: 187552
2013-08-01 00:41:55 +00:00
Marshall Clow a1cd191624 Implement constexpr (n3302) and fix operator *= and /=
llvm-svn: 187529
2013-07-31 21:02:34 +00:00
Marshall Clow df67172d59 Backwards!
llvm-svn: 187518
2013-07-31 19:39:37 +00:00
Marshall Clow a1d0d376c8 Implement n3469 - constexpr for chrono
llvm-svn: 187517
2013-07-31 19:32:19 +00:00
Howard Hinnant 4c80bfbd53 Debug mode for unordered_multimap. Some mods were done for unordered_map as well to keep all the tests passing. However unordered_map is at the very least still missing tests, if not functionality (if it isn't tested, it probably isn't working).
llvm-svn: 187446
2013-07-30 21:04:42 +00:00
Howard Hinnant e5c13decbe Debug mode for unordered_multiset. The exercise spotted a few places I had missed on unordered_set, so I picked those up as well.
There are actually two debug modes:

   1.  -D_LIBCPP_DEBUG2 or -D_LIBCPP_DEBUG2=1
       This is a relatively expensive debug mode, but very thorough.  This is normally what you want to debug with, but may turn O(1) operations into O(N) operations.

   2.  -D_LIBCPP_DEBUG2=0
       This is "debug lite."  Only preconditions that can be checked with O(1) expense are checked.  For example range checking on an indexing operation.  But not iterator validity.

llvm-svn: 187369
2013-07-29 19:05:47 +00:00
Howard Hinnant aa5aa98eab Add operator new[] to test. Partial fix for valgrind warning in http://llvm.org/bugs/show_bug.cgi?id=16703.
llvm-svn: 187358
2013-07-29 14:43:42 +00:00
Marshall Clow 83c08b4497 Implement N3421; comparison predicates<void>
llvm-svn: 187357
2013-07-29 14:21:53 +00:00
Howard Hinnant 55d5e76fdb Glen: Minor tweaks to locale.cpp to help it compile with exceptions turned off.
llvm-svn: 187332
2013-07-28 18:20:00 +00:00
Marshall Clow 7aa54577d1 literal suffixes for std::chrono
llvm-svn: 187078
2013-07-24 21:18:14 +00:00
Howard Hinnant b24c802489 Debug mode for unordered_set. I believe this to be fairly complete for
unordered_set, however it is not complete yet for unordered_multiset,
unordered_map or unordered_multimap.  There has been a lot of work done
for these other three containers, however that work was done just to
keep all of the tests passing.

You can try this out with -D_LIBCPP_DEBUG2.  You will have to link to a
libc++.dylib that has been compiled with src/debug.cpp.  So far, vector
(but not vector<bool>), list, and unordered_set are treated.  I hope to
get the other three unordered containers up fairly quickly now that
unordered_set is done.

The flag _LIBCPP_DEBUG2 will eventually be changed to _LIBCPP_DEBUG, but
not today.  This is my second effort at getting debug mode going for
libc++, and I'm not quite yet ready to throw all of the work under the
first attempt away.

The basic design is that all of the debug information is kept in a
central database, instead of in the containers.  This has been done as
an attempt to have debug mode and non-debug mode be ABI compatible with
each other.  There are some circumstances where if you construct a
container in an environment without debug mode and pass it into debug
mode, the checking will get confused and let you know with a readable
error message.  Passing containers the other way: from debug mode out to
a non-debugging mode container should be 100% safe (at least that is the
goal).

llvm-svn: 186991
2013-07-23 22:01:58 +00:00
Marshall Clow ca0be23b39 Implement string suffixes from N3642
llvm-svn: 186956
2013-07-23 17:05:24 +00:00
Howard Hinnant 7491a16031 Bill Fisher: This patch fixes a bug where std::regex in ECMAScript mode was ignoring capture groups inside lookahead assertions.
For example, matching /(?=(a))(a)/ to "a" should yield two captures: \1 = "a", \2 = "a"

llvm-svn: 186954
2013-07-23 16:18:04 +00:00
Howard Hinnant 1468d0cec7 Add some friendly messages to libcxx calls to abort().
llvm-svn: 186951
2013-07-23 16:05:56 +00:00
Richard Smith 79c06417d1 Add some missing cv-qualifiers.
llvm-svn: 186909
2013-07-23 01:24:30 +00:00
Anders Carlsson 8bb1dbbf75 Fix a bug in std::fill_n where memset would end up being called in cases when it shouldn’t.
Reviewed by Howard.

llvm-svn: 186875
2013-07-22 21:08:00 +00:00
Marshall Clow 75eff74803 Make tuple's constructor and std::get<>(tuple) constexpr. Final stage of fixing bug #16599. Thanks to Howard for the review and updates.
llvm-svn: 186834
2013-07-22 16:02:19 +00:00
Marshall Clow 8bf1f08a2c Make std::get constexpr
llvm-svn: 186525
2013-07-17 18:25:36 +00:00
Howard Hinnant fee09c68a0 Add pointer format test for Windows.
llvm-svn: 186472
2013-07-16 23:50:06 +00:00
Marshall Clow 18191ceb54 Bug 16599 part 2: Make std::pair's constructors and comparison operators (and make_pair) constexpr.
llvm-svn: 186430
2013-07-16 17:45:44 +00:00
Marshall Clow 1c682f0f0c Make std::forward and std::move (and std::move_if_noexcept) constexpr in C++14
llvm-svn: 186344
2013-07-15 20:46:11 +00:00
Howard Hinnant 22161401df Bill Fisher: This patch fixes an ill-formed comparison when parsing control escapes, e.g. "\cA\ca". The code will now throw an error_escape exception for invalid control sequences like "\c:" or "\c".
I've added the test cases to bad_escape.pass.cpp.

llvm-svn: 186335
2013-07-15 18:21:11 +00:00
Howard Hinnant 10f8387b94 A few fixes to tests for Windows port.
llvm-svn: 186334
2013-07-15 18:09:11 +00:00
Marshall Clow f20d2672e2 Add macro _LIBCPP_CONSTEXPR_AFTER_CXX11 for functions that have been marked constexpr post C++11
llvm-svn: 186323
2013-07-15 14:57:19 +00:00
Marshall Clow e99520c72e Implement n3584 - Addressing Tuples by Type
llvm-svn: 186237
2013-07-13 02:54:05 +00:00
Howard Hinnant 6d8a38c537 Port make_[un]signed tests to platforms where sizeof(wchar_t) == 2.
llvm-svn: 186136
2013-07-11 23:51:05 +00:00
Howard Hinnant c815a4e297 Bill Fisher: This patch fixes a less likely case where '\b' can back up into invalid memory, when driven by a regex_iterator (for case 1, see r185273 or http://llvm.org/bugs/show_bug.cgi?id=16240)
The attached test program also supplies a test for the case 1 fix in r185273.

llvm-svn: 186089
2013-07-11 15:32:55 +00:00
Marshall Clow 48c9fe29b2 Improved tests (and fixed a bug in the tests); thanks to Richard Smith for the suggestion
llvm-svn: 186022
2013-07-10 18:01:34 +00:00
Marshall Clow 8e1cb5adb3 move __save_flags from <random> to <ios> in preparation for reuse; no functionality change
llvm-svn: 185968
2013-07-09 20:34:14 +00:00
Howard Hinnant dbdeb153d8 Bill Fisher: This patch fixes a bug where regex_iterator doesn't indicate when it's restarting in the middle of a string. This bug causes /^a/ to match in the middle of the string "aaaaaaa", during iteration.
My patch uses  to communicate when  is false.

llvm-svn: 185950
2013-07-09 17:29:09 +00:00
Howard Hinnant e0fe3d2e96 War on tabs.
llvm-svn: 185865
2013-07-08 21:06:38 +00:00
Marshall Clow a7b0e5ddf8 Implement n3668 - std::exchange
llvm-svn: 185863
2013-07-08 20:54:40 +00:00
Marshall Clow f331327c6a Implement n3545 for c++14
llvm-svn: 185856
2013-07-08 20:05:31 +00:00
Howard Hinnant 271426e6ab Windows port for __codecvt_utf8<wchar_t>.
llvm-svn: 185849
2013-07-08 19:03:07 +00:00
Howard Hinnant 5e00063b86 Silence -Wint-to-void-pointer-cast warning in test.
llvm-svn: 185756
2013-07-06 14:41:36 +00:00
Howard Hinnant abb160e689 Remove implicit conversion from __value_type to value_type in [unordered_][multi]map. This fixes http://llvm.org/bugs/show_bug.cgi?id=16549
llvm-svn: 185711
2013-07-05 18:06:00 +00:00
Howard Hinnant 4a95f9eb7e Removed extension in [unordered_][multi]map which allowed one to emplace using just an argument for the key, as opposed to using piecewise_construct. However a bug report exposed that this created an unfortunate ambiguity. People who are currently using the extension will be notified the next time they compile, and will have to change to using piecewise_construct. There are no ABI issues with the removal of this extension. This fixes http://llvm.org/bugs/show_bug.cgi?id=16542
llvm-svn: 185666
2013-07-04 20:59:16 +00:00
Howard Hinnant bbdf669bde Simplify comparators of [unordered_][multi]map. This fixes http://llvm.org/bugs/show_bug.cgi?id=16538
llvm-svn: 185665
2013-07-04 19:46:35 +00:00
Joerg Sonnenberger 0644627bef Fix bashism.
llvm-svn: 185646
2013-07-04 15:11:10 +00:00
Marshall Clow 5b2ef2b1a6 Patch for N3655 (Transformation type traits) with Howard's additions
llvm-svn: 185597
2013-07-04 00:10:01 +00:00
Marshall Clow 60df5996a4 Commit patch for integer sequences. Suggested by Richard, reworked by Howard, and annotated by me
llvm-svn: 185569
2013-07-03 19:20:30 +00:00
Howard Hinnant 84b569d5cf Matthew Dempsky: Attached patch replaces the type punning with memcpy(), which on
x86/x86-64 clang optimizes to direct word accesses anyway.  This fixes an unaligned word access in murmurhash/cityhash.

llvm-svn: 185558
2013-07-03 17:39:28 +00:00
Marshall Clow 95ddb53049 Adorn make_unique with visibility and inline attributes
llvm-svn: 185468
2013-07-02 20:06:09 +00:00
Joerg Sonnenberger 392a178c33 Don't free the C locale on NetBSD.
llvm-svn: 185467
2013-07-02 19:46:18 +00:00
Howard Hinnant 904e587fa9 Updated CREDITS.TXT
llvm-svn: 185462
2013-07-02 19:00:29 +00:00
Howard Hinnant 9cfcdcb9e2 Matthew Dempsky: In libc++'s <locale>, there's already dependence on an snprintf_l
implementation and all of the char buffers readily have their
allocated size available, so we can easily use snprintf_l instead of
sprintf_l.

This avoids OpenBSD's linker warnings against using sprintf and
vsprintf.
Howard:  Please consider a patch for CREDITS.TXT

llvm-svn: 185457
2013-07-02 18:42:28 +00:00
Howard Hinnant 3fc9ef22b3 Constrain launch ~ operator to defined bits.
llvm-svn: 185452
2013-07-02 18:01:41 +00:00
Howard Hinnant ca69356d52 Windows support in thread::hardware_concurrency.
llvm-svn: 185451
2013-07-02 17:53:48 +00:00
Howard Hinnant 43bbdd29de Bill Fisher: This patch fixes a bug where the regex parser doesn't advance the pointer after reading the third character of an octal escape (in awk mode).
That is, regex{"\141", awk} results in the regular expression /a1/ instead of just /a/.

llvm-svn: 185449
2013-07-02 17:43:31 +00:00
Howard Hinnant 4a142ec6b0 XFAIL this test on 10.7 and 10.8
llvm-svn: 185391
2013-07-01 22:59:14 +00:00
Marshall Clow 28d8ba5f79 Implement n3656 - make_unique. Thanks to Howard for the review and suggestions.
llvm-svn: 185352
2013-07-01 18:16:03 +00:00
Marshall Clow d51891063f Implement n3658 - Compile-time integer sequences
llvm-svn: 185343
2013-07-01 16:26:55 +00:00
Howard Hinnant eecacc0fad In istream::ignore, check the delimeter as an int_type, not as a char_type, so as to correctly handle EOF. This fixes http://llvm.org/bugs/show_bug.cgi?id=16427
llvm-svn: 185298
2013-07-01 00:37:50 +00:00
Howard Hinnant 9dbbf8dece The bind and function functor constructors and assignment operators were overly general and getting confused with the copy constructor and copy assignment operators. Constrained them. This fixes http://llvm.org/bugs/show_bug.cgi?id=16385
llvm-svn: 185297
2013-07-01 00:01:51 +00:00
Howard Hinnant 9bf42533b7 Fix bind by making _is_valid_bind_return more robust. It should return false instead of give a compile time error, always. The problem was down in ____mu_return, the version that handles nested bind objects. This fixes http://llvm.org/bugs/show_bug.cgi?id=16343
llvm-svn: 185289
2013-06-30 19:48:15 +00:00
Howard Hinnant 8bd1771abe Matthew Dempsky: POSIX defines that the _POSIX_C_SOURCE macros are to be set by user
code to specify what version of POSIX the system should provide.  If
you want to check what version of POSIX is actually available, you're
supposed to test _POSIX_VERSION.

However, since sysconf() has been in POSIX since 1995, it's probably
safe to assume it's available on any system with a C++11 compiler,
especially if _SC_NPROCESSORS_ONLN is defined too.  So no point in a
complicated preprocessor rule if just we unconditionally include
<unistd.h> (on non-Windows systems).

Also, I've added a #warning for to help porters detect when a suitable
implementation isn't detected at compile-time.

Howard:  Matthew, can you patch CREDITS.TXT?  Thanks.
llvm-svn: 185275
2013-06-30 00:14:43 +00:00
Howard Hinnant 27841fd803 Matthew Dempsky: Same as stdexcept.cpp in libc++abi: we've already computed 'len strlen(msg)', so we can use memcpy() instead of strcpy().
llvm-svn: 185274
2013-06-29 23:53:20 +00:00
Howard Hinnant 660f2ae422 Prevent '\b' from backing up into invalid memory. Fixes http://llvm.org/bugs/show_bug.cgi?id=16240. Sorry, I can not think of a good test case for this one, except by running valgrind as reported in the bug.
llvm-svn: 185273
2013-06-29 23:45:43 +00:00
Howard Hinnant 1836462545 Add operators to make launch a bitmask type. Searched all of the standard, and libc++ to see if this error occurred elsewhere and didn't see any other place. This fixes http://llvm.org/bugs/show_bug.cgi?id=16207
llvm-svn: 185265
2013-06-29 18:38:17 +00:00
Howard Hinnant e9672d0448 Make cout a little more thread-safe. This fixes http://llvm.org/bugs/show_bug.cgi?id=12158
llvm-svn: 185222
2013-06-28 21:40:28 +00:00
Howard Hinnant 3f75953d82 Provide missing '{' in parsing extended quoted characters. This fixes http://llvm.org/bugs/show_bug.cgi?id=16135
llvm-svn: 185211
2013-06-28 20:31:05 +00:00