Mercurial > hg > octave-lyh

changeset 13739:0206484682c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rand.cc: Don't bring the whole std namespace into scope, only unordered_map
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Thu, 20 Oct 2011 14:28:13 -0500
parents 7ee61e56eaed
children 510237e67c2b 3c3b74677fa0
files src/DLD-FUNCTIONS/rand.cc
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/rand.cc
+++ b/src/DLD-FUNCTIONS/rand.cc
@@ -46,12 +46,6 @@
 #include "utils.h"
 #include "ov-re-mat.h"
 
-#ifdef USE_UNORDERED_MAP_WITH_TR1
-using namespace std::tr1;
-#else
-using namespace std;
-#endif
-
 /*
 %!shared __random_statistical_tests__
 %! % Flag whether the statistical tests should be run in "make check" or not
@@ -1037,6 +1031,13 @@
 @seealso{perms}\n\
 @end deftypefn")
 {
+
+#ifdef USE_UNORDERED_MAP_WITH_TR1
+using std::tr1::unordered_map;
+#else
+using std::unordered_map;
+#endif
+
   int nargin = args.length ();
   octave_value retval;