Permalink
Browse files

Merge branch 'remove_ngstd_from_global_namespace' into 'master'

Remove using statements from global namespace

See merge request !209
  • Loading branch information...
JSchoeberl committed Jul 13, 2017
2 parents e555ad7 + c391110 commit 211bf02c92b4d8843965a9889519a1f9a48df4b6
Showing with 2 additions and 4 deletions.
  1. +2 −2 basiclinalg/vector.hpp
  2. +0 −2 ngstd/sockets.hpp
@@ -116,7 +116,7 @@ namespace ngbla
/// copy vector. sizes must match
INLINE const FlatVector & operator= (const FlatVector & v) const
{
for (auto i : ::Range(size))
for (auto i : ngstd::Range(size))
data[i] = v(i);
return *this;
}
@@ -352,7 +352,7 @@ namespace ngbla
ALWAYS_INLINE const FlatVector & operator+= (const Expr<TB> & v) const
{
if (TB::IS_LINEAR)
for (auto i : ::Range(size))
for (auto i : ngstd::Range(size))
(*this)(i) += v.Spec()(i);
else
for (size_t i = 0; i < size; i++)
@@ -7,14 +7,12 @@
#include <ngstd.hpp>
using namespace ngstd;
#include <iostream>
#include <typeinfo>
#include <sys/types.h>
using namespace std;
#ifdef WIN32

0 comments on commit 211bf02

Please sign in to comment.