fix #2866 (#2903)

* fix #2866

* more proper fix

* format

* more format

* c++ version

* Revert "c++ version"

This reverts commit 5585cac.

* revert to C++11 way

* make_unique

* Revert "make_unique"

This reverts commit dd12a05.

test_apps/smokeTests/gridTools.cpp

@@ -7,6 +7,7 @@
 #include <cstdio>
 #include <string>
 #include <algorithm>
+#include <memory>
 
 #include <vapor/CFuncs.h>
 #include <vapor/OptionParser.h>
@@ -442,16 +443,16 @@ VAPoR::CurvilinearGrid *MakeCurvilinearTerrainGrid(const std::vector<size_t> &bs
     std::vector<double> maxu2d = {maxu[X], maxu[Y]};
 
     std::vector<float *> xblks = AllocateBlocks(bs2d, dims2d);
-    RegularGrid *        xrg = new RegularGrid(dims2d, bs2d, xblks, minu2d, maxu2d);
-    MakeRampOnAxis(xrg, minu[X], maxu[X], X);
+    auto                 xrg = std::unique_ptr<RegularGrid>(new RegularGrid(dims2d, bs2d, xblks, minu2d, maxu2d));
+    MakeRampOnAxis(xrg.get(), minu[X], maxu[X], X);
 
     std::vector<float *> yblks = AllocateBlocks(bs2d, dims2d);
-    RegularGrid *        yrg = new RegularGrid(dims2d, bs2d, yblks, minu2d, maxu2d);
-    MakeRampOnAxis(yrg, minu[Y], maxu[Y], Y);
+    auto                 yrg = std::unique_ptr<RegularGrid>(new RegularGrid(dims2d, bs2d, yblks, minu2d, maxu2d));
+    MakeRampOnAxis(yrg.get(), minu[Y], maxu[Y], Y);
 
     std::vector<float *> zblks = AllocateBlocks(bs, dims);
-    RegularGrid *        zrg = new RegularGrid(dims, bs, zblks, minu, maxu);
-    MakeRampOnAxis(zrg, minu[Z], maxu[Z], Z);
+    auto                 zrg = std::unique_ptr<RegularGrid>(new RegularGrid(dims, bs, zblks, minu, maxu));
+    MakeRampOnAxis(zrg.get(), minu[Z], maxu[Z], Z);
 
     std::vector<float *> blks = AllocateBlocks(bs, dims);
     CurvilinearGrid *    cg = new CurvilinearGrid(dims, bs, blks, *xrg, *yrg, *zrg, NULL);