From 29969b0fa5072f45cde7f20cc6a411376b52e171 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 12 Nov 2008 01:30:25 +0000
Subject: [PATCH] compiler bug with msvc9

---
 dtool/src/interrogatedb/interrogateFunction.I | 24 ---------------
 .../src/interrogatedb/interrogateFunction.cxx | 24 +++++++++++++++
 dtool/src/interrogatedb/interrogateFunction.h |  4 +--
 dtool/src/interrogatedb/interrogateType.I     | 29 -------------------
 dtool/src/interrogatedb/interrogateType.cxx   | 29 +++++++++++++++++++
 dtool/src/interrogatedb/interrogateType.h     |  4 +--
 6 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/dtool/src/interrogatedb/interrogateFunction.I b/dtool/src/interrogatedb/interrogateFunction.I
index 30bab0a8e7..6f4135c899 100644
--- a/dtool/src/interrogatedb/interrogateFunction.I
+++ b/dtool/src/interrogatedb/interrogateFunction.I
@@ -13,30 +13,6 @@
 ////////////////////////////////////////////////////////////////////
 
 
-////////////////////////////////////////////////////////////////////
-//     Function: InterrogateFunction::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE InterrogateFunction::
-InterrogateFunction(InterrogateModuleDef *def) :
-  InterrogateComponent(def)
-{
-  _flags = 0;
-  _class = 0;
-  _instances = (Instances *)NULL;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: InterrogateFunction::Copy Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE InterrogateFunction::
-InterrogateFunction(const InterrogateFunction &copy) {
-  (*this) = copy;
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: InterrogateFunction::is_global
 //       Access: Public
diff --git a/dtool/src/interrogatedb/interrogateFunction.cxx b/dtool/src/interrogatedb/interrogateFunction.cxx
index d1c0e8a9ce..34833ac80e 100644
--- a/dtool/src/interrogatedb/interrogateFunction.cxx
+++ b/dtool/src/interrogatedb/interrogateFunction.cxx
@@ -17,6 +17,30 @@
 #include "interrogate_datafile.h"
 #include "interrogateDatabase.h"
 
+////////////////////////////////////////////////////////////////////
+//     Function: InterrogateFunction::Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+InterrogateFunction::
+InterrogateFunction(InterrogateModuleDef *def) :
+  InterrogateComponent(def)
+{
+  _flags = 0;
+  _class = 0;
+  _instances = (Instances *)NULL;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: InterrogateFunction::Copy Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+InterrogateFunction::
+InterrogateFunction(const InterrogateFunction &copy) {
+  (*this) = copy;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: InterrogateFunction::Copy Assignment Operator
 //       Access: Public
diff --git a/dtool/src/interrogatedb/interrogateFunction.h b/dtool/src/interrogatedb/interrogateFunction.h
index 22cd890056..8d95be97f1 100644
--- a/dtool/src/interrogatedb/interrogateFunction.h
+++ b/dtool/src/interrogatedb/interrogateFunction.h
@@ -31,8 +31,8 @@ class CPPInstance;
 ////////////////////////////////////////////////////////////////////
 class EXPCL_DTOOLCONFIG InterrogateFunction : public InterrogateComponent {
 public:
-  INLINE InterrogateFunction(InterrogateModuleDef *def = NULL);
-  INLINE InterrogateFunction(const InterrogateFunction &copy);
+  InterrogateFunction(InterrogateModuleDef *def = NULL);
+  InterrogateFunction(const InterrogateFunction &copy);
   void operator = (const InterrogateFunction &copy);
 
   INLINE bool is_global() const;
diff --git a/dtool/src/interrogatedb/interrogateType.I b/dtool/src/interrogatedb/interrogateType.I
index da8ce6307d..7c8336d168 100644
--- a/dtool/src/interrogatedb/interrogateType.I
+++ b/dtool/src/interrogatedb/interrogateType.I
@@ -13,35 +13,6 @@
 ////////////////////////////////////////////////////////////////////
 
 
-////////////////////////////////////////////////////////////////////
-//     Function: InterrogateType::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE InterrogateType::
-InterrogateType(InterrogateModuleDef *def) :
-  InterrogateComponent(def)
-{
-  _flags = 0;
-  _outer_class = 0;
-  _atomic_token = AT_not_atomic;
-  _wrapped_type = 0;
-  _destructor = 0;
-
-  _cpptype = (CPPType *)NULL;
-  _cppscope = (CPPScope *)NULL;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: InterrogateType::Copy Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE InterrogateType::
-InterrogateType(const InterrogateType &copy) {
-  (*this) = copy;
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: InterrogateType::is_global
 //       Access: Public
diff --git a/dtool/src/interrogatedb/interrogateType.cxx b/dtool/src/interrogatedb/interrogateType.cxx
index 604ba91119..df87ea57f6 100644
--- a/dtool/src/interrogatedb/interrogateType.cxx
+++ b/dtool/src/interrogatedb/interrogateType.cxx
@@ -22,6 +22,35 @@
 // value for functions that must return a const string reference.
 string InterrogateType::_empty_string;
 
+////////////////////////////////////////////////////////////////////
+//     Function: InterrogateType::Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+InterrogateType::
+InterrogateType(InterrogateModuleDef *def) :
+  InterrogateComponent(def)
+{
+  _flags = 0;
+  _outer_class = 0;
+  _atomic_token = AT_not_atomic;
+  _wrapped_type = 0;
+  _destructor = 0;
+
+  _cpptype = (CPPType *)NULL;
+  _cppscope = (CPPScope *)NULL;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: InterrogateType::Copy Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+InterrogateType::
+InterrogateType(const InterrogateType &copy) {
+  (*this) = copy;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: InterrogateType::Derivation::output
 //       Access: Public
diff --git a/dtool/src/interrogatedb/interrogateType.h b/dtool/src/interrogatedb/interrogateType.h
index f468a53cad..f839e5e427 100644
--- a/dtool/src/interrogatedb/interrogateType.h
+++ b/dtool/src/interrogatedb/interrogateType.h
@@ -31,8 +31,8 @@ class CPPScope;
 ////////////////////////////////////////////////////////////////////
 class EXPCL_DTOOLCONFIG InterrogateType : public InterrogateComponent {
 public:
-  INLINE InterrogateType(InterrogateModuleDef *def = NULL);
-  INLINE InterrogateType(const InterrogateType &copy);
+  InterrogateType(InterrogateModuleDef *def = NULL);
+  InterrogateType(const InterrogateType &copy);
   void operator = (const InterrogateType &copy);
 
   INLINE bool is_global() const;