CarpetIOF5: Use new C++ tokens not, and, or instead of ~, &&, ||

darcs-hash:20061003235327-dae7b-58bb03de62c402c717b41dbe16dd3aa05e6b39b9.gz

12 files changed, 43 insertions, 43 deletions

diff --git a/CarpetDev/CarpetIOF5/src/IOF5.cc b/CarpetDev/CarpetIOF5/src/IOF5.cc
index 40b196751..83389906a 100644
--- a/CarpetDev/CarpetIOF5/src/IOF5.cc
+++ b/CarpetDev/CarpetIOF5/src/IOF5.cc
@@ -399,7 +399,7 @@ namespace CarpetIOF5 {
     
     bool const did_truncate = extending.get_did_truncate (filename);
     bool const do_truncate
-      = ! did_truncate and IO_TruncateOutputFiles (cctkGH);
+      = not did_truncate and IO_TruncateOutputFiles (cctkGH);
     extending.set_did_truncate (filename);
     
     F5::file_t file (cctkGH, filename, do_truncate);
@@ -475,7 +475,7 @@ namespace CarpetIOF5 {
     }
     
     herr_t const herr = H5Gclose (parameter_group);
-    assert (! herr);
+    assert (not herr);
   }
   
 } // namespace CarpetIOF5
diff --git a/CarpetDev/CarpetIOF5/src/coordinate_system.cc b/CarpetDev/CarpetIOF5/src/coordinate_system.cc
index b7660c0b1..49c023921 100644
--- a/CarpetDev/CarpetIOF5/src/coordinate_system.cc
+++ b/CarpetDev/CarpetIOF5/src/coordinate_system.cc
@@ -103,7 +103,7 @@ namespace CarpetIOF5 {
     ~ Cartesian_coordinate_system_t ()
     {
       herr_t const herr = H5Gclose (m_hdf5_coordinate_system);
-      assert (! herr);
+      assert (not herr);
     }
     
     
diff --git a/CarpetDev/CarpetIOF5/src/data_region.cc b/CarpetDev/CarpetIOF5/src/data_region.cc
index e79b243a3..1f6dea8df 100644
--- a/CarpetDev/CarpetIOF5/src/data_region.cc
+++ b/CarpetDev/CarpetIOF5/src/data_region.cc
@@ -26,7 +26,7 @@ namespace CarpetIOF5 {
       : m_tensor_component (tensor_component),
         m_region (region)
     {
-      assert (! region.empty());
+      assert (not region.empty());
       
       ostringstream namebuf;
       namebuf << "map=" << Carpet::map << " "
@@ -67,13 +67,13 @@ namespace CarpetIOF5 {
       herr_t herr;
       
       herr = H5Dclose (m_dataset);
-      assert (! herr);
+      assert (not herr);
       
       herr = H5Sclose (m_dataspace);
-      assert (! herr);
+      assert (not herr);
       
       herr = H5Pclose (m_properties);
-      assert (! herr);
+      assert (not herr);
     }
     
     
@@ -109,13 +109,13 @@ namespace CarpetIOF5 {
       herr
         = H5Dwrite (m_dataset, memory_hdf5_datatype, memory_dataspace,
                     m_dataspace, transfer_properties, data);
-      assert (! herr);
+      assert (not herr);
       
       herr = H5Pclose (transfer_properties);
-      assert (! herr);
+      assert (not herr);
       
       herr = H5Sclose (memory_dataspace);
-      assert (! herr);
+      assert (not herr);
     }
     
     
@@ -124,7 +124,7 @@ namespace CarpetIOF5 {
     invariant ()
       const
     {
-      return (! m_region.empty()
+      return (not m_region.empty()
               and m_properties >= 0
               and m_dataset >= 0
               and m_dataspace >= 0);
diff --git a/CarpetDev/CarpetIOF5/src/extending.cc b/CarpetDev/CarpetIOF5/src/extending.cc
index b2c429081..bff256190 100644
--- a/CarpetDev/CarpetIOF5/src/extending.cc
+++ b/CarpetDev/CarpetIOF5/src/extending.cc
@@ -41,13 +41,13 @@ namespace CarpetIOF5 {
     int ierr;
     int const io_method = CCTK_RegisterIOMethod (extension_name);
     ierr = CCTK_RegisterIOMethodOutputGH (io_method, OutputGH);
-    assert (! ierr);
+    assert (not ierr);
     ierr = CCTK_RegisterIOMethodTimeToOutput (io_method, TimeToOutput);
-    assert (! ierr);
+    assert (not ierr);
     ierr = CCTK_RegisterIOMethodTriggerOutput (io_method, TriggerOutput);
-    assert (! ierr);
+    assert (not ierr);
     ierr = CCTK_RegisterIOMethodOutputVarAs (io_method, OutputVarAs);
-    assert (! ierr);
+    assert (not ierr);
     
     return new extension_t;
   }
diff --git a/CarpetDev/CarpetIOF5/src/file.cc b/CarpetDev/CarpetIOF5/src/file.cc
index 07366f072..bf6167e5a 100644
--- a/CarpetDev/CarpetIOF5/src/file.cc
+++ b/CarpetDev/CarpetIOF5/src/file.cc
@@ -30,7 +30,7 @@ namespace CarpetIOF5 {
       } H5E_END_TRY;
       bool const file_exists = is_hdf5 > 0;
       
-      if (do_truncate or ! file_exists)
+      if (do_truncate or not file_exists)
       {
         m_hdf5_file
           = H5Fcreate (filenameptr, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -49,7 +49,7 @@ namespace CarpetIOF5 {
     ~ file_t()
     {
       herr_t const herr = H5Fclose (m_hdf5_file);
-      assert (! herr);
+      assert (not herr);
     }
     
     
diff --git a/CarpetDev/CarpetIOF5/src/physical_quantity.cc b/CarpetDev/CarpetIOF5/src/physical_quantity.cc
index bd1ee4f7c..2c4a24d65 100644
--- a/CarpetDev/CarpetIOF5/src/physical_quantity.cc
+++ b/CarpetDev/CarpetIOF5/src/physical_quantity.cc
@@ -44,7 +44,7 @@ namespace CarpetIOF5 {
     ~ physical_quantity_t ()
     {
       herr_t const herr = H5Gclose (m_hdf5_physical_quantity);
-      assert (! herr);
+      assert (not herr);
     }
     
     
diff --git a/CarpetDev/CarpetIOF5/src/simulation.cc b/CarpetDev/CarpetIOF5/src/simulation.cc
index eaf83fb1c..10441b498 100644
--- a/CarpetDev/CarpetIOF5/src/simulation.cc
+++ b/CarpetDev/CarpetIOF5/src/simulation.cc
@@ -37,7 +37,7 @@ namespace CarpetIOF5 {
     ~ simulation_t()
     {
       herr_t const herr = H5Gclose (m_hdf5_simulation);
-      assert (! herr);
+      assert (not herr);
     }
     
     
diff --git a/CarpetDev/CarpetIOF5/src/tensor_component.cc b/CarpetDev/CarpetIOF5/src/tensor_component.cc
index a9ea0e20c..c1575f232 100644
--- a/CarpetDev/CarpetIOF5/src/tensor_component.cc
+++ b/CarpetDev/CarpetIOF5/src/tensor_component.cc
@@ -38,7 +38,7 @@ namespace CarpetIOF5 {
     ~ tensor_component_t ()
     {
       herr_t const herr = H5Gclose (m_hdf5_tensor_component);
-      assert (! herr);
+      assert (not herr);
     }
     
     
diff --git a/CarpetDev/CarpetIOF5/src/timestep.cc b/CarpetDev/CarpetIOF5/src/timestep.cc
index 746c2fd6f..e7b75c4fe 100644
--- a/CarpetDev/CarpetIOF5/src/timestep.cc
+++ b/CarpetDev/CarpetIOF5/src/timestep.cc
@@ -67,7 +67,7 @@ namespace CarpetIOF5 {
     ~ timestep_t()
     {
       herr_t const herr = H5Gclose (m_hdf5_timestep);
-      assert (! herr);
+      assert (not herr);
     }
     
     
diff --git a/CarpetDev/CarpetIOF5/src/topology.cc b/CarpetDev/CarpetIOF5/src/topology.cc
index 85188c7ac..a3558448e 100644
--- a/CarpetDev/CarpetIOF5/src/topology.cc
+++ b/CarpetDev/CarpetIOF5/src/topology.cc
@@ -77,7 +77,7 @@ namespace CarpetIOF5 {
     ~ unigrid_topology_t ()
     {
       herr_t const herr = H5Gclose (m_hdf5_topology);
-      assert (! herr);
+      assert (not herr);
     }
     
     
@@ -150,7 +150,7 @@ namespace CarpetIOF5 {
     ~ mesh_refinement_topology_t ()
     {
       herr_t const herr = H5Gclose (m_hdf5_topology);
-      assert (! herr);
+      assert (not herr);
     }
     
     
diff --git a/CarpetDev/CarpetIOF5/src/utils.cc b/CarpetDev/CarpetIOF5/src/utils.cc
index ad0943ac6..ea9d30d91 100644
--- a/CarpetDev/CarpetIOF5/src/utils.cc
+++ b/CarpetDev/CarpetIOF5/src/utils.cc
@@ -104,7 +104,7 @@ namespace CarpetIOF5 {
       static bool initialised = false;
       static hid_t hdf_complex_datatype;
       
-      if (! initialised)
+      if (not initialised)
       {
         initialised = true;
         
@@ -239,11 +239,11 @@ namespace CarpetIOF5 {
         assert (attribute >= 0);
         herr_t herr;
         herr = H5Awrite (attribute, datatype, values);
-        assert (! herr);
+        assert (not herr);
         herr = H5Aclose (attribute);
-        assert (! herr);
+        assert (not herr);
         herr = H5Sclose (dataspace);
-        assert (! herr);
+        assert (not herr);
       }
       else
       {
@@ -260,11 +260,11 @@ namespace CarpetIOF5 {
         assert (adim == num_values);
         vector<T> buf (adim);
         herr = H5Aread (attribute, datatype, & buf.front());
-        assert (! herr);
+        assert (not herr);
         herr = H5Sclose (dataspace);
-        assert (! herr);
+        assert (not herr);
         herr = H5Aclose (attribute);
-        assert (! herr);
+        assert (not herr);
         for (int n = 0; n < num_values; ++ n)
         {
           assert (values [n] == buf [n]);
@@ -360,20 +360,20 @@ namespace CarpetIOF5 {
         herr_t herr;
         int const length = strlen (value) + 1;
         herr = H5Tset_size (datatype, length);
-        assert (! herr);
+        assert (not herr);
         hsize_t const dim = 1;
         hid_t const dataspace = H5Screate_simple (1, & dim, & dim);
         assert (dataspace >= 0);
         attribute = H5Acreate (where, name, datatype, dataspace, H5P_DEFAULT);
         assert (attribute >= 0);
         herr = H5Awrite (attribute, datatype, value);
-        assert (! herr);
+        assert (not herr);
         herr = H5Aclose (attribute);
-        assert (! herr);
+        assert (not herr);
         herr = H5Sclose (dataspace);
-        assert (! herr);
+        assert (not herr);
         herr = H5Tclose (datatype);
-        assert (! herr);
+        assert (not herr);
       }
       else
       {
@@ -396,13 +396,13 @@ namespace CarpetIOF5 {
         assert (dim == 1);
         vector<char> buf (length);
         herr = H5Aread (attribute, datatype, & buf.front());
-        assert (! herr);
+        assert (not herr);
         herr = H5Sclose (dataspace);
-        assert (! herr);
+        assert (not herr);
         herr = H5Aclose (attribute);
-        assert (! herr);
+        assert (not herr);
         herr = H5Tclose (datatype);
-        assert (! herr);
+        assert (not herr);
         assert (strcmp (& buf.front(), value) == 0);
       }
     }
diff --git a/CarpetDev/CarpetIOF5/src/writer.cc b/CarpetDev/CarpetIOF5/src/writer.cc
index a871861b4..f7aa3d05a 100644
--- a/CarpetDev/CarpetIOF5/src/writer.cc
+++ b/CarpetDev/CarpetIOF5/src/writer.cc
@@ -54,7 +54,7 @@ namespace CarpetIOF5 {
     if (Carpet::is_meta_mode())
     {
       for (Carpet::mglevel_iterator mglevel_iter (m_cctkGH);
-           ! mglevel_iter.done();
+           not mglevel_iter.done();
            mglevel_iter.step())
       {
         write_one_mglevel (timestep);
@@ -105,7 +105,7 @@ namespace CarpetIOF5 {
         if (Carpet::is_global_mode())
         {
           for (Carpet::reflevel_iterator reflevel_iter (m_cctkGH);
-               ! reflevel_iter.done();
+               not reflevel_iter.done();
                reflevel_iter.step())
           {
             write_one_reflevel (simulation);
@@ -196,7 +196,7 @@ namespace CarpetIOF5 {
     if (Carpet::is_level_mode())
     {
       for (Carpet::map_iterator map_iter (m_cctkGH, grouptype);
-           ! map_iter.done();
+           not map_iter.done();
            map_iter.step())
       {
         write_one_map (simulation);
@@ -249,7 +249,7 @@ namespace CarpetIOF5 {
       assert (grouptype >= 0);
       
       for (Carpet::component_iterator component_iter (m_cctkGH, grouptype);
-           ! component_iter.done();
+           not component_iter.done();
            component_iter.step())
       {
         write_one_component (tensor_component);