removed second CVS id tags, cleaned up new lines

Maarten

6 files changed, 21 insertions, 46 deletions

diff --git a/intern/memutil/MEM_NonCopyable.h b/intern/memutil/MEM_NonCopyable.h
index aa6fe24b6fb..e413c2ce28c 100644
--- a/intern/memutil/MEM_NonCopyable.h
+++ b/intern/memutil/MEM_NonCopyable.h
@@ -28,6 +28,10 @@
  *
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
+/**
+ * @file	MEM_NonCopyable.h
+ * Declaration of MEM_NonCopyable class.
+ */
 
 #ifndef NAN_INCLUDED_NonCopyable_h
 #define NAN_INCLUDED_NonCopyable_h
diff --git a/intern/memutil/MEM_RefCountPtr.h b/intern/memutil/MEM_RefCountPtr.h
index 1828fcc3edd..f71d9902a05 100644
--- a/intern/memutil/MEM_RefCountPtr.h
+++ b/intern/memutil/MEM_RefCountPtr.h
@@ -28,17 +28,15 @@
  *
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
-
-#ifndef NAN_INCLUDED_MEM_RefCountPtr_h
-#define NAN_INCLUDED_MEM_RefCountPtr_h
-
 /**
- * $Id$
- * Copyright (C) 2001 NaN Technologies B.V.
- *
+ * @file	MEM_RefCountPtr.h
+ * Declaration of MEM_RefCounted and MEM_RefCountable classes.
  * @author Laurence
  */
 
+#ifndef NAN_INCLUDED_MEM_RefCountPtr_h
+#define NAN_INCLUDED_MEM_RefCountPtr_h
+
 #include <stdlib.h> // for NULL !
 
 /**
@@ -203,7 +201,7 @@ public :
 	}
 
 	/**
-	 * Defalut constructor
+	 * Default constructor
 	 */
 
 	MEM_RefCountPtr(
@@ -253,6 +251,7 @@ public :
 		return *m_val;
 	}
 
+
 	/**
 	 * Destructor - deletes object if it's ref count is zero.
 	 */
diff --git a/intern/memutil/MEM_RefCounted.h b/intern/memutil/MEM_RefCounted.h
index f4699030ecd..239465cdf34 100644
--- a/intern/memutil/MEM_RefCounted.h
+++ b/intern/memutil/MEM_RefCounted.h
@@ -28,13 +28,9 @@
  *
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
-
 /**
-
- * $Id$
- * Copyright (C) 2001 NaN Technologies B.V.
- * @author	Maarten Gribnau
- * @date	March 31, 2001
+ * @file	MEM_RefCounted.h
+ * Declaration of MEM_RefCounted class.
  */
 
 #ifndef _H_MEM_REF_COUNTED
diff --git a/intern/memutil/MEM_RefCountedC-Api.h b/intern/memutil/MEM_RefCountedC-Api.h
index 0bba70388c5..f78194fe2f6 100644
--- a/intern/memutil/MEM_RefCountedC-Api.h
+++ b/intern/memutil/MEM_RefCountedC-Api.h
@@ -28,14 +28,9 @@
  *
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
-
 /**
-
- * $Id$
- * Copyright (C) 2001 NaN Technologies B.V.
+ * @file	MEM_RefCountedC-Api.h
  * Interface for C access to functionality relating to shared objects in the foundation library.
- * @author	Maarten Gribnau
- * @date	June 17, 2001
  */
 
 #ifndef _H_MEM_REF_COUNTED_C_API
@@ -52,14 +47,6 @@ extern "C" {
 #endif
 
 
-/**
- * A shared object in an object with reference counting.
- * When a shared object is ceated, it has reference count == 1.
- * If the the reference count of a shared object reaches zero, the object self-destructs.
- * The default constrcutor and destructor of this object have been made protected on purpose.
- * This disables the creation and disposal of shared objects on the stack.
- */
-
 /** 
  * Returns the reference count of this object.
  * @param shared The object to query.
diff --git a/intern/memutil/MEM_SmartPtr.h b/intern/memutil/MEM_SmartPtr.h
index f8305c0afd9..55bae151027 100644
--- a/intern/memutil/MEM_SmartPtr.h
+++ b/intern/memutil/MEM_SmartPtr.h
@@ -28,19 +28,19 @@
  *
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
+/**
+ * @file	MEM_SmartPtr.h
+ * Declaration of MEM_RefCounted and MEM_RefCountable classes.
+ * @author Laurence
+ */
 
 #ifndef NAN_INCLUDED_MEM_SmartPtr_h
 #define NAN_INCLUDED_MEM_SmartPtr_h
 
-/**
- * $Id$
- * Copyright (C) 2001 NaN Technologies B.V.
- *
- * @author Laurence
- */
 
 #include <stdlib.h> // for NULL !
 
+
 /**
  * @section MEM_SmartPtr 
  * This class defines a smart pointer similar to that defined in 
@@ -86,7 +86,7 @@
  *		MEM_SmartPtr<foo> m_foo;
  *	}
  *			
- * You my also safely construct vectors of MEM_SmartPtrs and 
+ * You may also safely construct vectors of MEM_SmartPtrs and 
  * have the vector own stuff you put into it. 
  *
  * e.g.
diff --git a/intern/memutil/intern/MEM_RefCountedC-Api.cpp b/intern/memutil/intern/MEM_RefCountedC-Api.cpp
index 87f7b0a6901..873b2c99a59 100644
--- a/intern/memutil/intern/MEM_RefCountedC-Api.cpp
+++ b/intern/memutil/intern/MEM_RefCountedC-Api.cpp
@@ -29,14 +29,6 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-/**
-
- * $Id$
- * Copyright (C) 2001 NaN Technologies B.V.
- * @author	Maarten Gribnau
- * @date	Jun 17, 2001
- */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -62,6 +54,3 @@ int MEM_RefCountedDecRef(MEM_TRefCountedObjectPtr shared)
 {
 	return shared ? ((MEM_RefCounted*)shared)->decRef() : 0;
 }
-
-
-