Cycles: remove prefix from source code file names

Remove prefix of filenames that is the same as the folder name. This used
to help when #includes were using individual files, but now they are always
relative to the cycles root directory and so the prefixes are redundant.

For patches and branches, git merge and rebase should be able to detect the
renames and move over code to the right file.

1 files changed, 101 insertions, 0 deletions

diff --git a/intern/cycles/util/log.h b/intern/cycles/util/log.h
new file mode 100644
index 00000000000..35c2d436d09
--- /dev/null
+++ b/intern/cycles/util/log.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2011-2014 Blender Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __UTIL_LOGGING_H__
+#define __UTIL_LOGGING_H__
+
+#if defined(WITH_CYCLES_LOGGING) && !defined(__KERNEL_GPU__)
+#  include <gflags/gflags.h>
+#  include <glog/logging.h>
+#endif
+
+#include <iostream>
+
+CCL_NAMESPACE_BEGIN
+
+#if !defined(WITH_CYCLES_LOGGING) || defined(__KERNEL_GPU__)
+class StubStream {
+ public:
+  template<class T> StubStream &operator<<(const T &)
+  {
+    return *this;
+  }
+};
+
+class LogMessageVoidify {
+ public:
+  LogMessageVoidify()
+  {
+  }
+  void operator&(const StubStream &)
+  {
+  }
+};
+
+#  define LOG_SUPPRESS() (true) ? ((void)0) : LogMessageVoidify() & StubStream()
+#  define LOG(severity) LOG_SUPPRESS()
+#  define VLOG(severity) LOG_SUPPRESS()
+#  define VLOG_IF(severity, condition) LOG_SUPPRESS()
+#  define VLOG_IS_ON(severity) false
+
+#  define CHECK(expression) LOG_SUPPRESS()
+
+#  define CHECK_NOTNULL(expression) LOG_SUPPRESS()
+#  define CHECK_NULL(expression) LOG_SUPPRESS()
+
+#  define CHECK_NEAR(actual, expected, eps) LOG_SUPPRESS()
+
+#  define CHECK_GE(a, b) LOG_SUPPRESS()
+#  define CHECK_NE(a, b) LOG_SUPPRESS()
+#  define CHECK_EQ(a, b) LOG_SUPPRESS()
+#  define CHECK_GT(a, b) LOG_SUPPRESS()
+#  define CHECK_LT(a, b) LOG_SUPPRESS()
+#  define CHECK_LE(a, b) LOG_SUPPRESS()
+
+#  define DCHECK(expression) LOG_SUPPRESS()
+
+#  define DCHECK_NOTNULL(expression) LOG_SUPPRESS()
+#  define DCHECK_NULL(expression) LOG_SUPPRESS()
+
+#  define DCHECK_NEAR(actual, expected, eps) LOG_SUPPRESS()
+
+#  define DCHECK_GE(a, b) LOG_SUPPRESS()
+#  define DCHECK_NE(a, b) LOG_SUPPRESS()
+#  define DCHECK_EQ(a, b) LOG_SUPPRESS()
+#  define DCHECK_GT(a, b) LOG_SUPPRESS()
+#  define DCHECK_LT(a, b) LOG_SUPPRESS()
+#  define DCHECK_LE(a, b) LOG_SUPPRESS()
+
+#  define LOG_ASSERT(expression) LOG_SUPPRESS()
+#endif
+
+#define VLOG_ONCE(level, flag) \
+  if (!flag) \
+  flag = true, VLOG(level)
+
+struct int2;
+struct float3;
+
+void util_logging_init(const char *argv0);
+void util_logging_start();
+void util_logging_verbosity_set(int verbosity);
+
+std::ostream &operator<<(std::ostream &os, const int2 &value);
+std::ostream &operator<<(std::ostream &os, const float3 &value);
+
+CCL_NAMESPACE_END
+
+#endif /* __UTIL_LOGGING_H__ */