4 files changed, 395 insertions, 0 deletions
diff --git a/o3d/base/cross/bits.h b/o3d/base/cross/bits.h
new file mode 100644
index 0000000..ffb3ccb
--- /dev/null
+++ b/o3d/base/cross/bits.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2009, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+// This file defines some bit utilities.
+
+#ifndef O3D_BASE_CROSS_BITS_H_
+#define O3D_BASE_CROSS_BITS_H_
+
+#include "base/logging.h"
+
+namespace o3d {
+namespace base {
+namespace bits {
+
+// Returns the integer i such as 2^i <= n < 2^(i+1)
+static inline int Log2Floor(unsigned int n) {
+  if (n == 0)
+    return -1;
+  int log = 0;
+  unsigned int value = n;
+  for (int i = 4; i >= 0; --i) {
+    int shift = (1 << i);
+    unsigned int x = value >> shift;
+    if (x != 0) {
+      value = x;
+      log += shift;
+    }
+  }
+  DCHECK_EQ(value, 1);
+  return log;
+}
+
+// Returns the integer i such as 2^(i-1) < n <= 2^i
+static inline int Log2Ceiling(unsigned int n) {
+  if (n == 0) {
+    return -1;
+  } else {
+    // Log2Floor returns -1 for 0, so the following works correctly for n=1.
+    return 1 + Log2Floor(n - 1);
+  }
+}
+
+}  // namespace bits
+}  // namespace base
+}  // namespace o3d
+
+#endif  // O3D_BASE_CROSS_BITS_H_
diff --git a/o3d/base/cross/bits_test.cc b/o3d/base/cross/bits_test.cc
new file mode 100644
index 0000000..4db01a0
--- /dev/null
+++ b/o3d/base/cross/bits_test.cc
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2009, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+// This file contains the unit tests for the bit utilities.
+
+#include "base/cross/bits.h"
+#include "tests/common/win/testing_common.h"
+
+namespace o3d {
+namespace base {
+namespace bits {
+
+TEST(Bits, TestLog2Floor) {
+  EXPECT_EQ(-1, Log2Floor(0));
+  EXPECT_EQ(0, Log2Floor(1));
+  EXPECT_EQ(1, Log2Floor(2));
+  EXPECT_EQ(1, Log2Floor(3));
+  EXPECT_EQ(2, Log2Floor(4));
+  for (unsigned int i = 3; i < 31; ++i) {
+    unsigned int value = 1U << i;
+    EXPECT_EQ(i, Log2Floor(value));
+    EXPECT_EQ(i, Log2Floor(value + 1));
+    EXPECT_EQ(i, Log2Floor(value + 2));
+    EXPECT_EQ(i - 1, Log2Floor(value - 1));
+    EXPECT_EQ(i - 1, Log2Floor(value - 2));
+  }
+  EXPECT_EQ(31, Log2Floor(0xffffffffU));
+}
+
+TEST(Bits, TestLog2Ceiling) {
+  EXPECT_EQ(-1, Log2Ceiling(0));
+  EXPECT_EQ(0, Log2Ceiling(1));
+  EXPECT_EQ(1, Log2Ceiling(2));
+  EXPECT_EQ(2, Log2Ceiling(3));
+  EXPECT_EQ(2, Log2Ceiling(4));
+  for (unsigned int i = 3; i < 31; ++i) {
+    unsigned int value = 1U << i;
+    EXPECT_EQ(i, Log2Ceiling(value));
+    EXPECT_EQ(i + 1, Log2Ceiling(value + 1));
+    EXPECT_EQ(i + 1, Log2Ceiling(value + 2));
+    EXPECT_EQ(i, Log2Ceiling(value - 1));
+    EXPECT_EQ(i, Log2Ceiling(value - 2));
+  }
+  EXPECT_EQ(32, Log2Ceiling(0xffffffffU));
+}
+
+}  // namespace bits
+}  // namespace base
+}  // namespace o3d
diff --git a/o3d/base/cross/std_functional.h b/o3d/base/cross/std_functional.h
new file mode 100644
index 0000000..884028a
--- /dev/null
+++ b/o3d/base/cross/std_functional.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2009, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+// This file declares STL functional classes in a cross-compiler way.
+
+#ifndef O3D_BASE_CROSS_STD_FUNCTIONAL_H_
+#define O3D_BASE_CROSS_STD_FUNCTIONAL_H_
+
+#include <build/build_config.h>
+
+#if defined(COMPILER_GCC)
+#include <ext/functional>
+namespace o3d {
+namespace base {
+using __gnu_cxx::select1st;
+using __gnu_cxx::select2nd;
+}  // namespace base
+}  // namespace o3d
+#elif defined(COMPILER_MSVC)
+#include <functional>
+#include <utility>
+namespace o3d {
+namespace base {
+
+template <class Pair>
+class select1st : public std::unary_function<Pair, typename Pair::first_type> {
+ public:
+  const result_type &operator()(const argument_type &value) const {
+    return value.first;
+  }
+};
+
+template <class Pair>
+class select2nd : public std::unary_function<Pair, typename Pair::second_type> {
+ public:
+  const result_type &operator()(const argument_type &value) const {
+    return value.second;
+  }
+};
+
+}  // namespace base
+}  // namespace o3d
+#else
+#error Unsupported compiler
+#endif
+
+#endif  // O3D_BASE_CROSS_STD_FUNCTIONAL_H_
diff --git a/o3d/base/cross/std_hash.h b/o3d/base/cross/std_hash.h
new file mode 100644
index 0000000..ceac439
--- /dev/null
+++ b/o3d/base/cross/std_hash.h
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2009, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+// This file declares STL hash map classes in a cross-compiler way, providing a
+// GCC-compatible (not MSVC) interface.
+
+#ifndef O3D_BASE_CROSS_STD_HASH_H_
+#define O3D_BASE_CROSS_STD_HASH_H_
+
+#include <build/build_config.h>
+
+#if defined(COMPILER_MSVC)
+#include <hash_map>
+#include <hash_set>
+namespace o3d {
+namespace base {
+
+struct PortableHashBase {
+  // These two public members are required by msvc.  4 and 8 are the
+  // default values.
+  static const size_t bucket_size = 4;
+  static const size_t min_buckets = 8;
+};
+
+template <typename Key>
+struct hash;
+
+// These are missing from MSVC.
+template<> struct hash<int> {
+  size_t operator()(int n) const {
+    return static_cast<size_t>(n);
+  }
+};
+
+template<> struct hash<unsigned int> {
+  size_t operator()(unsigned int n) const {
+    return static_cast<size_t>(n);
+  }
+};
+
+template<typename T> struct hash<T*> {
+  size_t operator()(T* t) const {
+    return reinterpret_cast<size_t>(t);
+  }
+};
+
+// If the 3rd template parameter of the GNU interface (KeyEqual) is
+// omitted, then we know that it's using the == operator, so we can
+// safely use the < operator.
+//
+// If the third parameter is specified, then we get a compile time
+// error, and we know we have to go back and add some #ifdefs.
+template <typename Key, typename Hash>
+struct HashAndLessOperator : PortableHashBase {
+  bool operator()(const Key& a, const Key& b) const {
+    return a < b;
+  }
+  size_t operator()(const Key& key) const {
+    return hasher_(key);
+  }
+  Hash hasher_;
+};
+
+template <class Key, class Hash = hash<Key> >
+class hash_set : public stdext::hash_set<Key, HashAndLessOperator<Key, Hash> > {
+ public:
+  hash_set() {}
+  explicit hash_set(int buckets) {}
+  typedef std::equal_to<Key> key_equal;
+  size_type bucket_count() const {
+    return size() / bucket_size;
+  }
+};
+
+template <class Key, class Val, class Hash = hash<Key> >
+class hash_map : public stdext::hash_map<
+    Key, Val, HashAndLessOperator<Key, Hash> > {
+ public:
+  hash_map() {}
+  explicit hash_map(int buckets) {}
+  typedef std::equal_to<Key> key_equal;
+  size_type bucket_count() const {
+    return size() / bucket_size;
+  }
+};
+
+template <class Key, class Hash = hash<Key> >
+class hash_multiset : public stdext::hash_multiset<
+    Key, HashAndLessOperator<Key, Hash> > {
+ public:
+  hash_multiset() {}
+  explicit hash_multiset(int buckets) {}
+  typedef std::equal_to<Key> key_equal;
+  size_type bucket_count() const {
+    return size() / bucket_size;
+  }
+};
+
+template <class Key, class Val, class Hash = hash<Key> >
+class hash_multimap : public stdext::hash_multimap<
+    Key, Val, HashAndLessOperator<Key, Hash> > {
+ public:
+  hash_multimap() {}
+  explicit hash_multimap(int buckets) {}
+  typedef std::equal_to<Key> key_equal;
+  size_type bucket_count() const {
+    return size() / bucket_size;
+  }
+};
+
+}  // namespace base
+}  // namespace o3d
+#elif defined COMPILER_GCC
+#include <ext/hash_map>
+#include <ext/hash_set>
+#include <tr1/functional>
+namespace __gnu_cxx {
+template <class T> struct hash<T*> {
+  size_t operator() (const T* x) const {
+    return hash<size_t>()(reinterpret_cast<size_t>(x));
+  }
+};
+}  // namespace __gnu_cxx
+
+namespace o3d {
+namespace base {
+using __gnu_cxx::hash_map;
+using __gnu_cxx::hash_multimap;
+using __gnu_cxx::hash_set;
+using __gnu_cxx::hash_multiset;
+using __gnu_cxx::hash;
+}  // namespace base
+}  // namespace o3d
+#endif  // COMPILER_MSVC
+
+#endif  // O3D_BASE_CROSS_STD_HASH_H_