unify include guard defines, __$FILENAME__

[blender-staging.git] / intern / memutil / MEM_RefCountPtr.h

diff --git a/intern/memutil/MEM_RefCountPtr.h b/intern/memutil/MEM_RefCountPtr.h
index f71d9902a052d33d4006f231c6597f471e653f49..4f4753450768cef4561795d135eae06aed7e9b27 100644 (file)
--- a/intern/memutil/MEM_RefCountPtr.h
+++ b/intern/memutil/MEM_RefCountPtr.h
@@ -1,14 +1,10 @@
-/**
- * $Id$
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
  * All rights reserved.
@@ -26,16 +22,21 @@
  *
  * Contributor(s): none yet.
  *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file memutil/MEM_RefCountPtr.h
+ *  \ingroup memutil
  */
+
 /**
  * @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
+#ifndef __MEM_REFCOUNTPTR_H__
+#define __MEM_REFCOUNTPTR_H__
 
 #include <stdlib.h> // for NULL !
 
@@ -140,7 +141,7 @@ protected :
        };
 
        MEM_RefCountable (
-               const MEM_RefCountable & other
+               const MEM_RefCountable &
        ) :
                m_count (0)
        {