From 4f3ceccb18d10684aca2723d3f1c85e2ba87ea65 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Wed, 14 Jul 2010 17:46:30 +0200
Subject: [PATCH] Fixed: GCC error with templates (by Naush)

---
 code/nel/include/nel/3d/ps_color.h             | 2 +-
 code/nel/include/nel/3d/ps_float.h             | 2 +-
 code/nel/include/nel/3d/ps_int.h               | 2 +-
 code/nel/include/nel/3d/ps_plane_basis_maker.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/nel/include/nel/3d/ps_color.h b/code/nel/include/nel/3d/ps_color.h
index 1c52d68e4..a46e2122a 100644
--- a/code/nel/include/nel/3d/ps_color.h
+++ b/code/nel/include/nel/3d/ps_color.h
@@ -34,7 +34,7 @@ namespace NL3D {
 
 
 template <>
-const char *CPSAttribMaker<NLMISC::CRGBA>::getType() { return "CRGBA"; }
+inline const char *CPSAttribMaker<NLMISC::CRGBA>::getType() { return "CRGBA"; }
 
 
 // Depending on the driver, the format of colors in vertex buffer may change. We don't want to change the format for each data that is (dynamically) in vertex buffer, so
diff --git a/code/nel/include/nel/3d/ps_float.h b/code/nel/include/nel/3d/ps_float.h
index 20878de27..8dcc732aa 100644
--- a/code/nel/include/nel/3d/ps_float.h
+++ b/code/nel/include/nel/3d/ps_float.h
@@ -28,7 +28,7 @@
 namespace NL3D {
 
 template <>
-const char *CPSAttribMaker<float>::getType() { return "float"; }
+inline const char *CPSAttribMaker<float>::getType() { return "float"; }
 
 /// these are some attribute makers for float
 /// This is a float blender class. It just blend between 2 values
diff --git a/code/nel/include/nel/3d/ps_int.h b/code/nel/include/nel/3d/ps_int.h
index 1985ec6d7..d821ad7b9 100644
--- a/code/nel/include/nel/3d/ps_int.h
+++ b/code/nel/include/nel/3d/ps_int.h
@@ -26,7 +26,7 @@
 namespace NL3D {
 
 template <>
-const char *CPSAttribMaker<uint32>::getType() { return "int32"; }
+inline const char *CPSAttribMaker<uint32>::getType() { return "int32"; }
 
 /// these are some attribute makers for int
 
diff --git a/code/nel/include/nel/3d/ps_plane_basis_maker.h b/code/nel/include/nel/3d/ps_plane_basis_maker.h
index b7ae6de29..51714a368 100644
--- a/code/nel/include/nel/3d/ps_plane_basis_maker.h
+++ b/code/nel/include/nel/3d/ps_plane_basis_maker.h
@@ -28,7 +28,7 @@
 namespace NL3D {
 
 template <>
-const char *CPSAttribMaker<CPlaneBasis>::getType() { return "CPlaneBasis";}
+inline const char *CPSAttribMaker<CPlaneBasis>::getType() { return "CPlaneBasis";}
 
 /** these are some attribute makers for plane_basis
  * This is a plane basis class. It just blend between 2 plane by linearly interpolating the normal