Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/stdcxx/patches/069-examples.patch
author Vladimir Marek <Vladimir.Marek@oracle.com>
Tue, 04 Oct 2016 14:04:16 +0200
changeset 7129 6587d6b48782
parent 402 94ae4d75524c
permissions -rw-r--r--
24794975 Update DBD::mysql to 4.0.37 24794982 problem in PERL-MOD/DBD-MYSQL
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
402
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
--- stdcxx-4.2.1/examples/include/stocks.h	2008-04-24 17:29:00.000000000 -0700
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
+++ stdcxx-4.2.1/examples/include/stocks.h	2011-02-22 06:45:25.141319167 -0800
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
@@ -62,6 +62,11 @@
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
 #  define GERMAN_LOCALE         "de_DE"
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
 #  define FRENCH_LOCALE         "fr_FR"
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
 #  define JAPANESE_LOCALE       "ja_JP"
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
+#elif defined (sun) || defined(__sun) || defined(__sun__)
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
+#  define US_LOCALE             "en_US.UTF-8"
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
+#  define GERMAN_LOCALE         "de_DE.UTF-8"
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
+#  define FRENCH_LOCALE         "fr_FR.UTF-8"
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
+#  define JAPANESE_LOCALE       "ja_JP.UTF-8"
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
 #elif defined (__osf__)
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
 #  define US_LOCALE             "en_US.ISO8859-1"
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
 #  define GERMAN_LOCALE         "de_DE.ISO8859-1"
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
--- stdcxx-4.2.1/examples/manual/money_get.cpp	2008-04-24 17:29:32.000000000 -0700
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
+++ stdcxx-4.2.1/examples/manual/money_get.cpp	2010-12-16 14:32:02.890774293 -0800
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
@@ -44,6 +44,8 @@
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
 // Windows
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
 #elif defined (_WIN32)
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
 const char en_US[] = "English";
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
+#elif defined(sun) || defined(__sun) || defined(__sun__)
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
+const char en_US[] = "en_US.UTF-8";
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
 
 #else
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
 
 // AIX, IRIX, Linux, Solaris
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
 const char en_US[] = "en_US";
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
 
--- stdcxx-4.2.1/examples/manual/codecvt1.cpp	2008-04-24 17:29:32.000000000 -0700
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
 
+++ stdcxx-4.2.1/examples/manual/codecvt1.cpp	2011-01-04 08:11:55.429355503 -0800
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
 
@@ -73,8 +73,7 @@
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
     const char* buffer;
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
 
 } locales [] = {
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
 
     { "ja_JP.UTF-8"    , wd_utf8  },
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    32
 
-    { "ja_JP.Shift_JIS", wd_sjis  },
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    33
 
-    { "ja_JP.EUC-JP"   , wd_eucjp }
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    34
 
+    { "ja_JP.eucJP"   , wd_eucjp }
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    35
 
 };
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    36
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    37
 
 std::mbstate_t init = std::mbstate_t ();
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    38
 
@@ -153,7 +152,7 @@
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    39
 
     //    representation that uses UTF-8 encoding;
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    40
 
     // 3. Compare the size and content of the final result with size and
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    41
 
     //    content of the wd_utf8 buffer.
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    42
 
-    const std::locale loc1 ("ja_JP.EUC-JP");
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    43
 
+    const std::locale loc1 ("ja_JP.eucJP");
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    44
 
     const std::locale loc2 ("ja_JP.UTF-8");
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    45
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    46
 
     const wcodecvt_byname_t& cc1 = std::use_facet<wcodecvt_byname_t> (loc1);
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    47
 












94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    48


--- stdcxx-4.2.1/examples/manual/numpunct.cpp	2008-04-24 17:29:32.000000000 -0700













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    49


+++ stdcxx-4.2.1/examples/manual/numpunct.cpp	2011-04-04 10:14:02.912617779 -0700













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    50


@@ -38,16 +38,20 @@













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    51


 {













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    52


     static const char* const













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    53


     locale_names [] = {













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    54


+#if defined(_RWSTD_OS_SUNOS)













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    55


+        "de_DE.UTF-8",













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    56


+#else













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    57


         "de_DE.ISO8859-1",       // AIX, Solaris, Tru64













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    58


         "de_DE.iso88591",        // HP-UX, Linux













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    59


         "de_DE.88591",













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    60


         "De_DE.88591",           // Reliant













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    61


         "de_DE",













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    62


-        "de",                    // Linux, Solaris













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    63


+        "de",                    // Linux













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    64


         "German",













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    65


         "german",                // Linux













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    66


         "deutsch",               // Linux













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    67


         "german_germany.1252",   // Windows













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    68


+#endif













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    69


         0                        // (sentinel)













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    70


     };













94ae4d75524c
7064836 stdcxx to Userland



Stefan Teleman <stefan.teleman@oracle.com>


parents: 

diff
changeset




    71


 















upstream/oracle/userland-gate