Skip to content

Commit a64855f

Browse files
committed
fix some namespace issues
1 parent 4a51f39 commit a64855f

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

DatasetClient.H

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ extern "C" {
3535
// pointer to MultiFab interface
3636

3737
// view a single fab from the multifab
38-
bool ArrayViewMultiFabElement(MultiFab *multifab, int element);
39-
bool ArrayViewMultiFabElementFormatLabel(MultiFab *multifab, int element,
38+
bool ArrayViewMultiFabElement(amrex::MultiFab *multifab, int element);
39+
bool ArrayViewMultiFabElementFormatLabel(amrex::MultiFab *multifab, int element,
4040
const char *format, const char *label);
4141

4242
// view the entire multifab
43-
bool ArrayViewMultiFab(MultiFab *multifab);
44-
bool ArrayViewMultiFabFormatLabel(MultiFab *multifab, const char *format,
43+
bool ArrayViewMultiFab(amrex::MultiFab *multifab);
44+
bool ArrayViewMultiFabFormatLabel(amrex::MultiFab *multifab, const char *format,
4545
const char *label);
4646

4747
// -------------------------------------------------------------

DatasetClient.cpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ const int PORTOFFSET = 5000;
2929
const char *defaultFormat = "%7.5e";
3030
const char *defaultLabel = " ";
3131

32+
using namespace amrex;
3233

3334
// -------------------------------------------------------------------
3435
bool CreateSocket(int &newsocket) {
35-
int sockfd;
36+
int sockfd;
3637
struct sockaddr_in serveraddr;
37-
char *serverhost = "localhost";
38-
struct hostent *serverhostp;
38+
char const *serverhost = "localhost";
39+
struct hostent *serverhostp;
3940

4041
int GETUID_SERVER_PORT = getuid() + PORTOFFSET; // use to contact the server
4142

@@ -196,19 +197,19 @@ bool SendRealArray(int sockfd, Real *data[], int nvar, // size nvar
196197
// pointer to fab interface
197198
// -------------------------------------------------------------------
198199
// -------------------------------------------------------------------
199-
bool ArrayView(FArrayBox *debugFab) {
200+
bool ArrayView(amrex::FArrayBox *debugFab) {
200201
return(ArrayViewFab(debugFab));
201202
}
202203

203204

204205
// -------------------------------------------------------------------
205-
bool ArrayViewFab(FArrayBox *debugFab) {
206+
bool ArrayViewFab(amrex::FArrayBox *debugFab) {
206207
return( ArrayViewFabFormatLabel(debugFab, defaultFormat, "Fab") );
207208
}
208209

209210

210211
// -------------------------------------------------------------------
211-
bool ArrayViewFabFormatLabel(FArrayBox *debugFab, const char *format,
212+
bool ArrayViewFabFormatLabel(amrex::FArrayBox *debugFab, const char *format,
212213
const char *label)
213214
{
214215
bool returnValue;
@@ -240,20 +241,20 @@ bool ArrayViewFabFormatLabel(FArrayBox *debugFab, const char *format,
240241
// pointer to MultiFab interface
241242
// -------------------------------------------------------------------
242243
// -------------------------------------------------------------------
243-
bool ArrayViewMultiFab(MultiFab *debugMultiFab) {
244+
bool ArrayViewMultiFab(amrex::MultiFab *debugMultiFab) {
244245
return (ArrayViewMultiFabFormatLabel(debugMultiFab, defaultFormat, "MultiFab"));
245246
}
246247

247248

248249
// -------------------------------------------------------------------
249-
bool ArrayViewMultiFabElement(MultiFab *debugMultiFab, int element) {
250+
bool ArrayViewMultiFabElement(amrex::MultiFab *debugMultiFab, int element) {
250251
return( ArrayViewMultiFabElementFormatLabel(debugMultiFab, element,
251252
defaultFormat, "MultiFab element") );
252253
}
253254

254255

255256
// -------------------------------------------------------------------
256-
bool ArrayViewMultiFabElementFormatLabel(MultiFab *debugMultiFab, int element,
257+
bool ArrayViewMultiFabElementFormatLabel(amrex::MultiFab *debugMultiFab, int element,
257258
const char *format, const char *label)
258259
{
259260
if( ! debugMultiFab->ok()) {
@@ -583,7 +584,7 @@ bool ArrayViewRealPtrArrayNVarDims(Real *data[], int nvar, // size nvar
583584

584585

585586
// -------------------------------------------------------------------
586-
bool ArrayViewMultiFabFormatLabel(MultiFab *multifab, const char *format,
587+
bool ArrayViewMultiFabFormatLabel(amrex::MultiFab *multifab, const char *format,
587588
const char *label)
588589
{
589590
int sockfd;

0 commit comments

Comments
 (0)