[Bf-blender-cvs] [d9d9c97] object_nodes: Moved util_typedesc file into the compile module.

[Lukas Tönne]

Commit: d9d9c9710651522f0f6e7de59fdc599729cb67a5
Author: Lukas Tönne
Date:   Wed Jan 13 19:32:24 2016 +0100
Branches: object_nodes
https://developer.blender.org/rBd9d9c9710651522f0f6e7de59fdc599729cb67a5

Moved util_typedesc file into the compile module.

===================================================================

M	source/blender/blenvm/CMakeLists.txt
M	source/blender/blenvm/compile/CMakeLists.txt
M	source/blender/blenvm/compile/bvm_function.h
M	source/blender/blenvm/compile/bvm_nodegraph.h
A	source/blender/blenvm/compile/bvm_typedesc.cc
A	source/blender/blenvm/compile/bvm_typedesc.h
D	source/blender/blenvm/util/bvm_util_typedesc.h

===================================================================

diff --git a/source/blender/blenvm/CMakeLists.txt b/source/blender/blenvm/CMakeLists.txt
index 2cb78d0..8e18180 100644
--- a/source/blender/blenvm/CMakeLists.txt
+++ b/source/blender/blenvm/CMakeLists.txt
@@ -53,7 +53,6 @@ set(SRC
 	util/bvm_util_math.h
 	util/bvm_util_string.h
 	util/bvm_util_thread.h
-	util/bvm_util_typedesc.h
 
 	BVM_api.h
 	BVM_types.h
diff --git a/source/blender/blenvm/compile/CMakeLists.txt b/source/blender/blenvm/compile/CMakeLists.txt
index 2da67e2..a2b5890 100644
--- a/source/blender/blenvm/compile/CMakeLists.txt
+++ b/source/blender/blenvm/compile/CMakeLists.txt
@@ -46,6 +46,8 @@ set(SRC
 	bvm_function.cc
 	bvm_nodegraph.cc
 	bvm_nodegraph.h
+	bvm_typedesc.cc
+	bvm_typedesc.h
 )
 
 TEST_UNORDERED_MAP_SUPPORT()
diff --git a/source/blender/blenvm/compile/bvm_function.h b/source/blender/blenvm/compile/bvm_function.h
index 8002b1e..0f6c734 100644
--- a/source/blender/blenvm/compile/bvm_function.h
+++ b/source/blender/blenvm/compile/bvm_function.h
@@ -39,9 +39,9 @@
 
 #include "bvm_instruction_list.h"
 #include "bvm_opcode.h"
+#include "bvm_typedesc.h"
 #include "bvm_util_string.h"
 #include "bvm_util_thread.h"
-#include "bvm_util_typedesc.h"
 
 namespace bvm {
 
diff --git a/source/blender/blenvm/compile/bvm_nodegraph.h b/source/blender/blenvm/compile/bvm_nodegraph.h
index b6e778d..4e6153d 100644
--- a/source/blender/blenvm/compile/bvm_nodegraph.h
+++ b/source/blender/blenvm/compile/bvm_nodegraph.h
@@ -51,8 +51,8 @@ extern "C" {
 }
 
 #include "bvm_opcode.h"
+#include "bvm_typedesc.h"
 #include "bvm_util_string.h"
-#include "bvm_util_typedesc.h"
 
 namespace bvm {
 
diff --git a/source/blender/blenvm/compile/bvm_typedesc.cc b/source/blender/blenvm/compile/bvm_typedesc.cc
new file mode 100644
index 0000000..23f679b
--- /dev/null
+++ b/source/blender/blenvm/compile/bvm_typedesc.cc
@@ -0,0 +1,32 @@
+/*
+ * ***** 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) Blender Foundation
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Lukas Toenne
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/blenvm/intern/bvm_typedesc.cc
+ *  \ingroup bvm
+ */
+
+#include "bvm_typedesc.h"
diff --git a/source/blender/blenvm/util/bvm_util_typedesc.h b/source/blender/blenvm/compile/bvm_typedesc.h
similarity index 99%
rename from source/blender/blenvm/util/bvm_util_typedesc.h
rename to source/blender/blenvm/compile/bvm_typedesc.h
index ccb9858..49d1746 100644
--- a/source/blender/blenvm/util/bvm_util_typedesc.h
+++ b/source/blender/blenvm/compile/bvm_typedesc.h
@@ -25,12 +25,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/blenvm/intern/bvm_type_typedesc.h
+/** \file blender/blenvm/intern/bvm_typedesc.h
  *  \ingroup bvm
  */
 
-#ifndef __BVM_TYPE_TYPEDESC_H__
-#define __BVM_TYPE_TYPEDESC_H__
+#ifndef __BVM_TYPEDESC_H__
+#define __BVM_TYPEDESC_H__
 
 #include <cassert>
 #include <vector>