[Bf-blender-cvs] [fbdaaa7] object_nodes: Removed unused deprecated code parts.
Lukas Tönne
noreply at git.blender.org
Tue Nov 24 09:44:15 CET 2015
Commit: fbdaaa72e955acc23bc9e0bfaed3de00f5d5819b
Author: Lukas Tönne
Date: Mon Nov 9 13:22:01 2015 +0100
Branches: object_nodes
https://developer.blender.org/rBfbdaaa72e955acc23bc9e0bfaed3de00f5d5819b
Removed unused deprecated code parts.
===================================================================
M source/blender/blenvm/BVM_api.h
M source/blender/blenvm/CMakeLists.txt
M source/blender/blenvm/intern/bvm_api.cc
D source/blender/blenvm/intern/bvm_function.cc
D source/blender/blenvm/intern/bvm_function.h
D source/blender/blenvm/intern/bvm_module.cc
D source/blender/blenvm/intern/bvm_module.h
D source/blender/blenvm/intern/bvm_schedule.cc
D source/blender/blenvm/intern/bvm_schedule.h
===================================================================
diff --git a/source/blender/blenvm/BVM_api.h b/source/blender/blenvm/BVM_api.h
index 2f0cdfd..ec727e4 100644
--- a/source/blender/blenvm/BVM_api.h
+++ b/source/blender/blenvm/BVM_api.h
@@ -47,16 +47,6 @@ struct BVMModule;
void BVM_init(void);
void BVM_free(void);
-struct BVMModule *BVM_module_create(void);
-void BVM_module_free(struct BVMModule *mod);
-
-struct BVMFunction *BVM_module_create_function(struct BVMModule *mod, const char *name);
-bool BVM_module_delete_function(struct BVMModule *mod, const char *name);
-
-/* ------------------------------------------------------------------------- */
-
-const char *BVM_function_name(const struct BVMFunction *fun);
-
/* ------------------------------------------------------------------------- */
void BVM_expression_free(struct BVMExpression *expr);
diff --git a/source/blender/blenvm/CMakeLists.txt b/source/blender/blenvm/CMakeLists.txt
index 388abee..0967b78 100644
--- a/source/blender/blenvm/CMakeLists.txt
+++ b/source/blender/blenvm/CMakeLists.txt
@@ -44,12 +44,6 @@ set(INC_SYS
set(SRC
intern/bvm_api.cc
- intern/bvm_function.cc
- intern/bvm_function.h
- intern/bvm_module.cc
- intern/bvm_module.h
- intern/bvm_schedule.cc
- intern/bvm_schedule.h
util/bvm_util_hash.h
util/bvm_util_map.h
diff --git a/source/blender/blenvm/intern/bvm_api.cc b/source/blender/blenvm/intern/bvm_api.cc
index dabbd50..846717e 100644
--- a/source/blender/blenvm/intern/bvm_api.cc
+++ b/source/blender/blenvm/intern/bvm_api.cc
@@ -53,8 +53,6 @@ extern "C" {
#include "bvm_codegen.h"
#include "bvm_eval.h"
#include "bvm_expression.h"
-#include "bvm_function.h"
-#include "bvm_module.h"
#include "bvm_nodegraph.h"
#include "bvm_util_map.h"
#include "bvm_util_thread.h"
@@ -71,23 +69,6 @@ void BVM_free(void)
/* ------------------------------------------------------------------------- */
-BLI_INLINE bvm::Module *_MOD(struct BVMModule *mod)
-{ return (bvm::Module *)mod; }
-
-struct BVMModule *BVM_module_create(void)
-{ return (struct BVMModule *)(new bvm::Module()); }
-
-void BVM_module_free(BVMModule *mod)
-{ delete _MOD(mod); }
-
-struct BVMFunction *BVM_module_create_function(BVMModule *mod, const char *name)
-{ return (struct BVMFunction *)_MOD(mod)->create_function(name); }
-
-bool BVM_module_delete_function(BVMModule *mod, const char *name)
-{ return _MOD(mod)->remove_function(name); }
-
-/* ------------------------------------------------------------------------- */
-
BLI_INLINE bvm::Expression *_EXPR(struct BVMExpression *expr)
{ return (bvm::Expression *)expr; }
diff --git a/source/blender/blenvm/intern/bvm_function.cc b/source/blender/blenvm/intern/bvm_function.cc
deleted file mode 100644
index 94a1533..0000000
--- a/source/blender/blenvm/intern/bvm_function.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * ***** 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 bvm_function.cc
- * \ingroup bvm
- */
-
-#include "MEM_guardedalloc.h"
-
-#include "bvm_function.h"
-
-namespace bvm {
-
-} /* namespace bvm */
diff --git a/source/blender/blenvm/intern/bvm_function.h b/source/blender/blenvm/intern/bvm_function.h
deleted file mode 100644
index 1568d6e..0000000
--- a/source/blender/blenvm/intern/bvm_function.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * ***** 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 *****
- */
-
-#ifndef __BVM_FUNCTION_H__
-#define __BVM_FUNCTION_H__
-
-/** \file bvm_function.h
- * \ingroup bvm
- */
-
-#include "bvm_util_string.h"
-
-namespace bvm {
-
-struct FunctionArgument {
- string name;
- bool is_return_value;
-};
-
-struct Function {
- string name;
-};
-
-} /* namespace bvm */
-
-#endif /* __BVM_FUNCTION_H__ */
diff --git a/source/blender/blenvm/intern/bvm_module.cc b/source/blender/blenvm/intern/bvm_module.cc
deleted file mode 100644
index a158c9b..0000000
--- a/source/blender/blenvm/intern/bvm_module.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * ***** 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 bvm_module.cc
- * \ingroup bvm
- */
-
-#include <cstdlib> /* needed for BLI_assert */
-
-extern "C" {
-#include "BLI_utildefines.h"
-#include "BLI_ghash.h"
-#include "BLI_string.h"
-}
-
-#include "MEM_guardedalloc.h"
-
-#include "bvm_function.h"
-#include "bvm_module.h"
-
-namespace bvm {
-
-Module::Module()
-{
-}
-
-Module::~Module()
-{
-}
-
-Function *Module::create_function(const string &/*name*/)
-{
- // TODO
- return NULL;
-}
-
-bool Module::remove_function(const string &/*name*/)
-{
- // TODO
- return true;
-}
-
-} /* namespace bvm */
diff --git a/source/blender/blenvm/intern/bvm_module.h b/source/blender/blenvm/intern/bvm_module.h
deleted file mode 100644
index e9b7720..0000000
--- a/source/blender/blenvm/intern/bvm_module.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * ***** 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 *****
- */
-
-#ifndef __BVM_MODULE_H__
-#define __BVM_MODULE_H__
-
-/** \file bvm_module.h
- * \ingroup bvm
- */
-
-#include "bvm_util_map.h"
-#include "bvm_util_string.h"
-
-namespace bvm {
-
-struct Function;
-
-struct Module {
- typedef unordered_map<string, Function*> FunctionMap;
-
- FunctionMap functions;
-
- Module();
- ~Module();
-
- Function *create_function(const string &name);
- bool remove_function(const string &name);
-};
-
-} /* namespace bvm */
-
-#endif /* __BVM_MODULE_H__ */
diff --git a/source/blender/blenvm/intern/bvm_schedule.cc b/source/blender/blenvm/intern/bvm_schedule.cc
deleted file mode 100644
index 94a1533..0000000
--- a/source/blender/blenvm/intern/bvm_schedule.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * ***** 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 *
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list