Changeset bc73be3 in mainline for uspace/lib/cpp/include/__bits/random.hpp

Timestamp:

2019-06-27T08:51:20Z (6 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

cpp: merge and resolve conflicts

File:

• uspace/lib/cpp/include/__bits/random.hpp (modified) (1 diff)

uspace/lib/cpp/include/__bits/random.hpp

@@ -1030 +1030 @@
              *       something better.
              */
-            hel::srand(hel::time(nullptr));
+            ::srand(::time(nullptr));
         }
 
         result_type operator()()
         {
-            return hel::rand();
+            return ::rand();
         }