From 34ddf3b19089ab9e7a4aa048cae695d26a8f523a Mon Sep 17 00:00:00 2001
From: Scott R Charlton <charlton@usgs.gov>
Date: Mon, 10 May 2010 01:06:08 +0000
Subject: [PATCH] added standard return values

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4356 1feff8c3-07ed-0310-ac33-dd36852eb9cd
---
 include/IPhreeqc.h   |  3 +++
 include/IPhreeqc.hpp |  4 ++++
 include/Var.h        |  3 +++
 tests/test_cxx.cxx   | 40 ++++++++++++++++++++--------------------
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/include/IPhreeqc.h b/include/IPhreeqc.h
index ab274e44..eba25dfb 100644
--- a/include/IPhreeqc.h
+++ b/include/IPhreeqc.h
@@ -1,3 +1,6 @@
+/*! @file IPhreeqc.h
+	@brief C/Fortran Documentation
+*/
 #ifndef INC_IPHREEQC_H
 #define INC_IPHREEQC_H
 
diff --git a/include/IPhreeqc.hpp b/include/IPhreeqc.hpp
index 9f6096cd..86066c2a 100644
--- a/include/IPhreeqc.hpp
+++ b/include/IPhreeqc.hpp
@@ -1,3 +1,7 @@
+/*! @file IPhreeqc.hpp
+	@brief C++ Documentation
+*/
+
 #ifndef INC_IPHREEQC_HPP
 #define INC_IPHREEQC_HPP
 
diff --git a/include/Var.h b/include/Var.h
index f3d19db5..124cae24 100644
--- a/include/Var.h
+++ b/include/Var.h
@@ -1,3 +1,6 @@
+/*! @file Var.h
+	@brief %IPhreeqc VARIANT Documentation
+*/
 // Var.h
 
 #ifndef __VAR_H_INC
diff --git a/tests/test_cxx.cxx b/tests/test_cxx.cxx
index d882fc6b..ff2ca696 100644
--- a/tests/test_cxx.cxx
+++ b/tests/test_cxx.cxx
@@ -23,20 +23,20 @@ public:
       }
 
       (*_p.*_set)(true);
-      
+
       if (!(*_p.*_get)())
       {
         return EXIT_FAILURE;
       }
-      
+
       (*_p.*_set)(false);
-      
+
       if ((*_p.*_get)())
       {
         return EXIT_FAILURE;
       }
-      
-      return 0;
+
+      return EXIT_SUCCESS;
     }
 };
 
@@ -44,60 +44,60 @@ int
 main(int argc, const char* argv[])
 {
   IPhreeqc iphreeqc;
-  
+
   // Dump
   TTestGetSet<IPhreeqc> testDump(&iphreeqc, &IPhreeqc::GetDumpOn, &IPhreeqc::SetDumpOn);
-  if (testDump.Test() != 0)
+  if (testDump.Test() != EXIT_SUCCESS)
   {
     return EXIT_FAILURE;
   }
-  
+
   // Dump string
   TTestGetSet<IPhreeqc> testDumpString(&iphreeqc, &IPhreeqc::GetDumpStringOn, &IPhreeqc::SetDumpStringOn);
-  if (testDumpString.Test() != 0)
+  if (testDumpString.Test() != EXIT_SUCCESS)
   {
     return EXIT_FAILURE;
   }
-  
+
   // Error
   TTestGetSet<IPhreeqc> testError(&iphreeqc, &IPhreeqc::GetErrorOn, &IPhreeqc::SetErrorOn);
-  if (testError.Test() != 0)
+  if (testError.Test() != EXIT_SUCCESS)
   {
     return EXIT_FAILURE;
   }
-  
+
   // Log
   TTestGetSet<IPhreeqc> testLog(&iphreeqc, &IPhreeqc::GetLogOn, &IPhreeqc::SetLogOn);
-  if (testLog.Test() != 0)
+  if (testLog.Test() != EXIT_SUCCESS)
   {
     return EXIT_FAILURE;
   }
-  
+
   // Output
   TTestGetSet<IPhreeqc> testOutput(&iphreeqc, &IPhreeqc::GetOutputOn, &IPhreeqc::SetOutputOn);
-  if (testOutput.Test() != 0)
+  if (testOutput.Test() != EXIT_SUCCESS)
   {
     return EXIT_FAILURE;
   }
-  
+
   // Selected output
   TTestGetSet<IPhreeqc> testSelectedOutput(&iphreeqc, &IPhreeqc::GetSelectedOutputOn, &IPhreeqc::SetSelectedOutputOn);
-  if (testSelectedOutput.Test() != 0)
+  if (testSelectedOutput.Test() != EXIT_SUCCESS)
   {
     return EXIT_FAILURE;
   }
-  
+
   if (iphreeqc.LoadDatabase("phreeqc.dat") != 0)
   {
     std::cout << iphreeqc.GetErrorString();
     return EXIT_FAILURE;
   }
-  
+
   if (iphreeqc.RunFile("ex1") != 0)
   {
     std::cout << iphreeqc.GetErrorString();
     return EXIT_FAILURE;
   }
-  
+
   return EXIT_SUCCESS;
 }