From e4012d4f434e51857a95a5f1d6df44162561737f Mon Sep 17 00:00:00 2001
From: jthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5>
Date: Fri, 20 Sep 2002 16:11:58 +0000
Subject: when we have a default argument to a C++ function, only give the
 default in the .hh file -- in the .cc file you're not supposed to repeat it
 (it's now in /* comments /), eg

// foo.hh
void foo(int x, int y = 0);

// foo.cc
#include "foo.hh"
void foo(int x, int y /* = 0 */)
{
// ...
}


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@760 f88db872-0e4f-0410-b76b-b9085cfa78c5
---
 src/gr/horizon_function.cc |  6 +++---
 src/jtutil/array.cc        | 32 ++++++++++++++++----------------
 src/jtutil/linear_map.cc   |  4 ++--
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/gr/horizon_function.cc b/src/gr/horizon_function.cc
index 17a312d..679b120 100644
--- a/src/gr/horizon_function.cc
+++ b/src/gr/horizon_function.cc
@@ -116,9 +116,9 @@ void compute_H(patch_system& ps,
 bool horizon_function(patch_system& ps,
 		      const struct cactus_grid_info& cgi,
 		      const struct geometry_info& gi,
-		      bool Jacobian_flag = false,
-		      bool print_msg_flag = false,
-		      jtutil::norm<fp>* H_norms_ptr = NULL)
+		      bool Jacobian_flag /* = false */,
+		      bool print_msg_flag /* = false */,
+		      jtutil::norm<fp>* H_norms_ptr /* = NULL */)
 {
 if (print_msg_flag)
    then CCTK_VInfo(CCTK_THORNSTRING, "   horizon function");
diff --git a/src/jtutil/array.cc b/src/jtutil/array.cc
index b660ced..5eb841a 100644
--- a/src/jtutil/array.cc
+++ b/src/jtutil/array.cc
@@ -41,8 +41,8 @@ namespace jtutil
 	  {
 template <typename T>
 array1d<T>::array1d(int min_i_in, int max_i_in,
-		     T *array_in = NULL,
-		     int stride_i_in = 0)
+		    T *array_in /* = NULL */,
+		    int stride_i_in /* = 0 */)
 	: array_(array_in),
 	  offset_(0),		// temp value, changed below
 	  stride_i_(stride_i_in),
@@ -98,9 +98,9 @@ namespace jtutil
 	  {
 template <typename T>
 array2d<T>::array2d(int min_i_in, int max_i_in,
-		     int min_j_in, int max_j_in,
-		     T *array_in = NULL,
-		     int stride_i_in = 0, int stride_j_in = 0)
+		    int min_j_in, int max_j_in,
+		    T *array_in /* = NULL */,
+		    int stride_i_in /* = 0 */, int stride_j_in /* = 0 */)
 	: array_(array_in),
 	  offset_(0),		// temp value, changed below
 	  stride_i_(stride_i_in), stride_j_(stride_j_in),
@@ -162,11 +162,11 @@ namespace jtutil
 	  {
 template <typename T>
 array3d<T>::array3d(int min_i_in, int max_i_in,
-		     int min_j_in, int max_j_in,
-		     int min_k_in, int max_k_in,
-		     T *array_in = NULL,
-		     int stride_i_in = 0, int stride_j_in = 0,
-		     int stride_k_in = 0)
+		    int min_j_in, int max_j_in,
+		    int min_k_in, int max_k_in,
+		    T *array_in /* = NULL */,
+		    int stride_i_in /* = 0 */, int stride_j_in /* = 0 */,
+		    int stride_k_in /* = 0 */)
 	: array_(array_in),
 	  offset_(0),		// temp value, changed below
 	  stride_i_(stride_i_in), stride_j_(stride_j_in),
@@ -235,12 +235,12 @@ namespace jtutil
 	  {
 template <typename T>
 array4d<T>::array4d(int min_i_in, int max_i_in,
-		     int min_j_in, int max_j_in,
-		     int min_k_in, int max_k_in,
-		     int min_l_in, int max_l_in,
-		     T *array_in = NULL,
-		     int stride_i_in = 0, int stride_j_in = 0,
-		     int stride_k_in = 0, int stride_l_in = 0)
+		    int min_j_in, int max_j_in,
+		    int min_k_in, int max_k_in,
+		    int min_l_in, int max_l_in,
+		    T *array_in /* = NULL */,
+		    int stride_i_in /* = 0 */, int stride_j_in /* = 0 */,
+		    int stride_k_in /* = 0 */, int stride_l_in /* = 0 */)
 	: array_(array_in),
 	  offset_(0),		// temp value, changed below
 	  stride_i_(stride_i_in), stride_j_(stride_j_in),
diff --git a/src/jtutil/linear_map.cc b/src/jtutil/linear_map.cc
index 514f636..41a779e 100644
--- a/src/jtutil/linear_map.cc
+++ b/src/jtutil/linear_map.cc
@@ -142,7 +142,7 @@ return inverse_delta_ * (x - origin_);
 namespace jtutil
 	  {
 template <typename fp>
-int linear_map<fp>::int_of_fp(fp x, noninteger_action nia = error)
+int linear_map<fp>::int_of_fp(fp x, noninteger_action nia /* = error */)
 	const
 {
 const fp fp_int = fp_int_of_fp(x);
@@ -213,7 +213,7 @@ namespace jtutil
 	  {
 template <typename fp>
 int linear_map<fp>::delta_int_of_delta_fp(fp delta_x,
-					    noninteger_action nia = error)
+					  noninteger_action nia /* = error */)
 	const
 {
 const fp fp_delta_int = inverse_delta_ * delta_x;
-- 
cgit v1.2.3