Changeset 4889 for nanovis/branches/1.1/TransferFunction.h

Timestamp:

Dec 19, 2014 10:00:34 PM (8 years ago)

Author:

ldelgass

Message:

Merge r3611:3618 from trunk

Location:

nanovis/branches/1.1

Files:

• . (modified) (1 prop)
• TransferFunction.h (modified) (3 diffs)

nanovis/branches/1.1/TransferFunction.h

@@ -14 +14 @@
  * ======================================================================
  */
-#ifndef TRANSFER_FUNCTION_H
-#define TRANSFER_FUNCTION_H
+#ifndef NV_TRANSFER_FUNCTION_H
+#define NV_TRANSFER_FUNCTION_H
 
 #include <string>
@@ -22 +22 @@
 
 #include "Texture1D.h"
+
+namespace nv {
 
 class TransferFunction
@@ -78 +80 @@
 };
 
+}
+
 #endif