OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove "using namespace std" (a C++17 MSVC bug)

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-09-24 18:10:01 +02:00
parent 97bd2fc67f
commit 54273fff39
2 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
View File

@ -640,7 +640,7 @@ std::map<QString, std::vector<RigCompletionData>>
auto it = completions.find( gridName ); auto it = completions.find( gridName );
if ( it == completions.end() ) if ( it == completions.end() )
{ {
completions.insert( std::pair<QString, std::vector<RigCompletionData>>( gridName, {completion} ) ); completions.insert( std::pair<QString, std::vector<RigCompletionData>>( gridName, { completion } ) );
} }
else else
{ {
@ -716,19 +716,19 @@ void RicWellPathExportCompletionDataFeatureImpl::exportWelspecsToFile( RimEclips
RifTextDataTableFormatter formatter( stream ); RifTextDataTableFormatter formatter( stream );
formatter.setColumnSpacing( 2 ); formatter.setColumnSpacing( 2 );
std::vector<RifTextDataTableColumn> header = {RifTextDataTableColumn( "Well" ), std::vector<RifTextDataTableColumn> header = { RifTextDataTableColumn( "Well" ),
RifTextDataTableColumn( "Grp" ), RifTextDataTableColumn( "Grp" ),
RifTextDataTableColumn( "I" ), RifTextDataTableColumn( "I" ),
RifTextDataTableColumn( "J" ), RifTextDataTableColumn( "J" ),
RifTextDataTableColumn( "RefDepth" ), RifTextDataTableColumn( "RefDepth" ),
RifTextDataTableColumn( "Type" ), RifTextDataTableColumn( "Type" ),
RifTextDataTableColumn( "DrainRad" ), RifTextDataTableColumn( "DrainRad" ),
RifTextDataTableColumn( "GasInEq" ), RifTextDataTableColumn( "GasInEq" ),
RifTextDataTableColumn( "AutoShut" ), RifTextDataTableColumn( "AutoShut" ),
RifTextDataTableColumn( "XFlow" ), RifTextDataTableColumn( "XFlow" ),
RifTextDataTableColumn( "FluidPVT" ), RifTextDataTableColumn( "FluidPVT" ),
RifTextDataTableColumn( "HydSDens" ), RifTextDataTableColumn( "HydSDens" ),
RifTextDataTableColumn( "FluidInPlReg" )}; RifTextDataTableColumn( "FluidInPlReg" ) };
formatter.keyword( "WELSPECS" ); formatter.keyword( "WELSPECS" );
formatter.header( header ); formatter.header( header );
@ -783,20 +783,20 @@ void RicWellPathExportCompletionDataFeatureImpl::exportWelspeclToFile(
RifTextDataTableFormatter formatter( stream ); RifTextDataTableFormatter formatter( stream );
formatter.setColumnSpacing( 2 ); formatter.setColumnSpacing( 2 );
std::vector<RifTextDataTableColumn> header = {RifTextDataTableColumn( "Well" ), std::vector<RifTextDataTableColumn> header = { RifTextDataTableColumn( "Well" ),
RifTextDataTableColumn( "Grp" ), RifTextDataTableColumn( "Grp" ),
RifTextDataTableColumn( "LGR" ), RifTextDataTableColumn( "LGR" ),
RifTextDataTableColumn( "I" ), RifTextDataTableColumn( "I" ),
RifTextDataTableColumn( "J" ), RifTextDataTableColumn( "J" ),
RifTextDataTableColumn( "RefDepth" ), RifTextDataTableColumn( "RefDepth" ),
RifTextDataTableColumn( "Type" ), RifTextDataTableColumn( "Type" ),
RifTextDataTableColumn( "DrainRad" ), RifTextDataTableColumn( "DrainRad" ),
RifTextDataTableColumn( "GasInEq" ), RifTextDataTableColumn( "GasInEq" ),
RifTextDataTableColumn( "AutoShut" ), RifTextDataTableColumn( "AutoShut" ),
RifTextDataTableColumn( "XFlow" ), RifTextDataTableColumn( "XFlow" ),
RifTextDataTableColumn( "FluidPVT" ), RifTextDataTableColumn( "FluidPVT" ),
RifTextDataTableColumn( "HydSDens" ), RifTextDataTableColumn( "HydSDens" ),
RifTextDataTableColumn( "FluidInPlReg" )}; RifTextDataTableColumn( "FluidInPlReg" ) };
formatter.keyword( "WELSPECL" ); formatter.keyword( "WELSPECL" );
formatter.header( header ); formatter.header( header );
@ -960,44 +960,46 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompdatTableUsingFormatte
if ( gridName.isEmpty() ) if ( gridName.isEmpty() )
{ {
header = {RifTextDataTableColumn( "Well" ), header =
RifTextDataTableColumn( "I" ), { RifTextDataTableColumn( "Well" ),
RifTextDataTableColumn( "J" ), RifTextDataTableColumn( "I" ),
RifTextDataTableColumn( "K1" ), RifTextDataTableColumn( "J" ),
RifTextDataTableColumn( "K2" ), RifTextDataTableColumn( "K1" ),
RifTextDataTableColumn( "Status" ), RifTextDataTableColumn( "K2" ),
RifTextDataTableColumn( "SAT" ), RifTextDataTableColumn( "Status" ),
RifTextDataTableColumn( "TR", RifTextDataTableColumn( "SAT" ),
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableColumn( "TR",
RifTextDataTableColumn( "DIAM" ), RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableColumn( "KH", RifTextDataTableColumn( "DIAM" ),
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableColumn( "KH",
RifTextDataTableColumn( "S" ), RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableColumn( "Df", RifTextDataTableColumn( "S" ),
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableColumn( "Df",
RifTextDataTableColumn( "DIR" )}; RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableColumn( "DIR" ) };
formatter.keyword( "COMPDAT" ); formatter.keyword( "COMPDAT" );
} }
else else
{ {
header = {RifTextDataTableColumn( "Well" ), header =
RifTextDataTableColumn( "LgrName" ), { RifTextDataTableColumn( "Well" ),
RifTextDataTableColumn( "I" ), RifTextDataTableColumn( "LgrName" ),
RifTextDataTableColumn( "J" ), RifTextDataTableColumn( "I" ),
RifTextDataTableColumn( "K1" ), RifTextDataTableColumn( "J" ),
RifTextDataTableColumn( "K2" ), RifTextDataTableColumn( "K1" ),
RifTextDataTableColumn( "Status" ), RifTextDataTableColumn( "K2" ),
RifTextDataTableColumn( "SAT" ), RifTextDataTableColumn( "Status" ),
RifTextDataTableColumn( "TR", RifTextDataTableColumn( "SAT" ),
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableColumn( "TR",
RifTextDataTableColumn( "DIAM" ), RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableColumn( "KH", RifTextDataTableColumn( "DIAM" ),
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableColumn( "KH",
RifTextDataTableColumn( "S" ), RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableColumn( "Df", RifTextDataTableColumn( "S" ),
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableColumn( "Df",
RifTextDataTableColumn( "DIR" )}; RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableColumn( "DIR" ) };
formatter.keyword( "COMPDATL" ); formatter.keyword( "COMPDATL" );
} }
@ -1175,8 +1177,7 @@ std::vector<RigCompletionData> RicWellPathExportCompletionDataFeatureImpl::gener
!interval->isActiveOnDate( settings.caseToApply->timeStepDates()[settings.timeStep] ) ) !interval->isActiveOnDate( settings.caseToApply->timeStepDates()[settings.timeStep] ) )
continue; continue;
using namespace std; std::pair<std::vector<cvf::Vec3d>, std::vector<double>> perforationPointsAndMD =
pair<vector<cvf::Vec3d>, vector<double>> perforationPointsAndMD =
wellPath->wellPathGeometry()->clippedPointSubset( interval->startMD(), interval->endMD() ); wellPath->wellPathGeometry()->clippedPointSubset( interval->startMD(), interval->endMD() );
std::vector<WellPathCellIntersectionInfo> intersectedCells = std::vector<WellPathCellIntersectionInfo> intersectedCells =
@ -1273,7 +1274,7 @@ void RicWellPathExportCompletionDataFeatureImpl::appendCompletionData(
{ {
completionData->insert( completionData->insert(
std::pair<size_t, std::vector<RigCompletionData>>( completion.completionDataGridCell().globalCellIndex(), std::pair<size_t, std::vector<RigCompletionData>>( completion.completionDataGridCell().globalCellIndex(),
std::vector<RigCompletionData>{completion} ) ); std::vector<RigCompletionData>{ completion } ) );
} }
} }
} }

23
ApplicationCode/Commands/HoloLensCommands/farmhash/farmhash.cc
View File

@ -411,7 +411,6 @@ template <> uint128_t DebugTweak(uint128_t x) {
} // namespace NAMESPACE_FOR_HASH_FUNCTIONS } // namespace NAMESPACE_FOR_HASH_FUNCTIONS
using namespace std;
using namespace NAMESPACE_FOR_HASH_FUNCTIONS; using namespace NAMESPACE_FOR_HASH_FUNCTIONS;
namespace farmhashna { namespace farmhashna {
#undef Fetch #undef Fetch
@ -480,7 +479,7 @@ STATIC_INLINE uint64_t HashLen17to32(const char *s, size_t len) {
// Return a 16-byte hash for 48 bytes. Quick and dirty. // Return a 16-byte hash for 48 bytes. Quick and dirty.
// Callers do best to use "random-looking" values for a and b. // Callers do best to use "random-looking" values for a and b.
STATIC_INLINE pair<uint64_t, uint64_t> WeakHashLen32WithSeeds( STATIC_INLINE std::pair<uint64_t, uint64_t> WeakHashLen32WithSeeds(
uint64_t w, uint64_t x, uint64_t y, uint64_t z, uint64_t a, uint64_t b) { uint64_t w, uint64_t x, uint64_t y, uint64_t z, uint64_t a, uint64_t b) {
a += w; a += w;
b = Rotate(b + a + z, 21); b = Rotate(b + a + z, 21);
@ -488,11 +487,11 @@ STATIC_INLINE pair<uint64_t, uint64_t> WeakHashLen32WithSeeds(
a += x; a += x;
a += y; a += y;
b += Rotate(a, 44); b += Rotate(a, 44);
return make_pair(a + z, b + c); return std::make_pair(a + z, b + c);
} }
// Return a 16-byte hash for s[0] ... s[31], a, and b. Quick and dirty. // Return a 16-byte hash for s[0] ... s[31], a, and b. Quick and dirty.
STATIC_INLINE pair<uint64_t, uint64_t> WeakHashLen32WithSeeds( STATIC_INLINE std::pair<uint64_t, uint64_t> WeakHashLen32WithSeeds(
const char* s, uint64_t a, uint64_t b) { const char* s, uint64_t a, uint64_t b) {
return WeakHashLen32WithSeeds(Fetch(s), return WeakHashLen32WithSeeds(Fetch(s),
Fetch(s + 8), Fetch(s + 8),
@ -536,8 +535,8 @@ uint64_t Hash64(const char *s, size_t len) {
uint64_t x = seed; uint64_t x = seed;
uint64_t y = seed * k1 + 113; uint64_t y = seed * k1 + 113;
uint64_t z = ShiftMix(y * k2 + 113) * k2; uint64_t z = ShiftMix(y * k2 + 113) * k2;
pair<uint64_t, uint64_t> v = make_pair(0, 0); std::pair<uint64_t, uint64_t> v = std::make_pair(0, 0);
pair<uint64_t, uint64_t> w = make_pair(0, 0); std::pair<uint64_t, uint64_t> w = std::make_pair(0, 0);
x = x * k2 + Fetch(s); x = x * k2 + Fetch(s);
// Set end so that after the loop we have 1 to 64 bytes left to process. // Set end so that after the loop we have 1 to 64 bytes left to process.
@ -609,8 +608,8 @@ uint64_t Hash64WithSeeds(const char *s, size_t len,
uint64_t x = seed0; uint64_t x = seed0;
uint64_t y = seed1 * k2 + 113; uint64_t y = seed1 * k2 + 113;
uint64_t z = farmhashna::ShiftMix(y * k2) * k2; uint64_t z = farmhashna::ShiftMix(y * k2) * k2;
pair<uint64_t, uint64_t> v = make_pair(seed0, seed1); std::pair<uint64_t, uint64_t> v = std::make_pair(seed0, seed1);
pair<uint64_t, uint64_t> w = make_pair(0, 0); std::pair<uint64_t, uint64_t> w = std::make_pair(0, 0);
uint64_t u = x - z; uint64_t u = x - z;
x *= k2; x *= k2;
uint64_t mul = k2 + (u & 0x82); uint64_t mul = k2 + (u & 0x82);
@ -1743,7 +1742,7 @@ STATIC_INLINE uint64_t HashLen0to16(const char *s, size_t len) {
// Return a 16-byte hash for 48 bytes. Quick and dirty. // Return a 16-byte hash for 48 bytes. Quick and dirty.
// Callers do best to use "random-looking" values for a and b. // Callers do best to use "random-looking" values for a and b.
STATIC_INLINE pair<uint64_t, uint64_t> WeakHashLen32WithSeeds( STATIC_INLINE std::pair<uint64_t, uint64_t> WeakHashLen32WithSeeds(
uint64_t w, uint64_t x, uint64_t y, uint64_t z, uint64_t a, uint64_t b) { uint64_t w, uint64_t x, uint64_t y, uint64_t z, uint64_t a, uint64_t b) {
a += w; a += w;
b = Rotate(b + a + z, 21); b = Rotate(b + a + z, 21);
@ -1751,11 +1750,11 @@ STATIC_INLINE pair<uint64_t, uint64_t> WeakHashLen32WithSeeds(
a += x; a += x;
a += y; a += y;
b += Rotate(a, 44); b += Rotate(a, 44);
return make_pair(a + z, b + c); return std::make_pair(a + z, b + c);
} }
// Return a 16-byte hash for s[0] ... s[31], a, and b. Quick and dirty. // Return a 16-byte hash for s[0] ... s[31], a, and b. Quick and dirty.
STATIC_INLINE pair<uint64_t, uint64_t> WeakHashLen32WithSeeds( STATIC_INLINE std::pair<uint64_t, uint64_t> WeakHashLen32WithSeeds(
const char* s, uint64_t a, uint64_t b) { const char* s, uint64_t a, uint64_t b) {
return WeakHashLen32WithSeeds(Fetch(s), return WeakHashLen32WithSeeds(Fetch(s),
Fetch(s + 8), Fetch(s + 8),
@ -1806,7 +1805,7 @@ uint128_t CityHash128WithSeed(const char *s, size_t len, uint128_t seed) {
// We expect len >= 128 to be the common case. Keep 56 bytes of state: // We expect len >= 128 to be the common case. Keep 56 bytes of state:
// v, w, x, y, and z. // v, w, x, y, and z.
pair<uint64_t, uint64_t> v, w; std::pair<uint64_t, uint64_t> v, w;
uint64_t x = Uint128Low64(seed); uint64_t x = Uint128Low64(seed);
uint64_t y = Uint128High64(seed); uint64_t y = Uint128High64(seed);
uint64_t z = len * k1; uint64_t z = len * k1;