Handle void * conversions in FreeBSD/x86 native code to fix C++ build.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.cp / namespace1.cc

diff --git a/gdb/testsuite/gdb.cp/namespace1.cc b/gdb/testsuite/gdb.cp/namespace1.cc
index 6f9f4ef8ef3ec3916397c9540e9a801451b3c5fc..a58952d0ca4ff283be9ee9c813e6f9998d8377b0 100644 (file)
--- a/gdb/testsuite/gdb.cp/namespace1.cc
+++ b/gdb/testsuite/gdb.cp/namespace1.cc
@@ -1,4 +1,4 @@
-/* Copyright 2003, 2004, 2007 Free Software Foundation, Inc.
+/* Copyright 2003-2016 Free Software Foundation, Inc.
 
    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
@@ -11,22 +11,23 @@
    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, see <http://www.gnu.org/licenses/>.
-   */
-
-
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 namespace C
 {
   class OtherFileClass {
   public:
     int z;
-  };
 
-  void ensureOtherRefs () {
-    // NOTE (2004-04-23, carlton): This function is here only to make
-    // sure that GCC 3.4 outputs debug info for this class.
-    static OtherFileClass *c = new OtherFileClass();
+    typedef short cOtherFileClassType;
+    typedef long cOtherFileClassType2;
+    static const cOtherFileClassType cOtherFileClassVar = 318;
+    static const cOtherFileClassType2 cOtherFileClassVar2 = 320;
+    cOtherFileClassType cOtherFileClassVar_use ();
+  };
+  OtherFileClass::cOtherFileClassType OtherFileClass::cOtherFileClassVar_use ()
+  {
+    return cOtherFileClassVar + cOtherFileClassVar2;
   }
 
   namespace {
@@ -34,8 +35,30 @@ namespace C
   };
 
   int cOtherFile = 316;
+
+  void ensureOtherRefs () {
+    // NOTE (2004-04-23, carlton): This function is here only to make
+    // sure that GCC 3.4 outputs debug info for this class.
+    static OtherFileClass *c = new OtherFileClass();
+    c->z = cOtherFile + cXOtherFile;
+  }
+
+  typedef short cOtherFileType;
+  typedef long cOtherFileType2;
+  static const cOtherFileType cOtherFileVar = 319;
+  static const cOtherFileType2 cOtherFileVar2 = 321;
+  cOtherFileType cOtherFileVar_use ()
+  {
+    return cOtherFileVar + cOtherFileVar2;
+  }
 }
 
 namespace {
   int XOtherFile = 317;
 }
+
+int ensureOtherRefs ()
+{
+  C::ensureOtherRefs ();
+  return XOtherFile;
+}