[beast/devel: 8/77] BIRNET: remove birnetcpu.*

[Tim Janik <timj src gnome org>]

commit 26c3087f3de5d8bee13732f82af825cbd23c678f
Author: Tim Janik <timj gnu org>
Date:   Thu Mar 28 19:02:30 2013 +0000

    BIRNET: remove birnetcpu.*

 birnet/Makefile.am    |    2 -
 birnet/birnet.hh      |    1 -
 birnet/birnetcpu.cc   |  278 -------------------------------------------------
 birnet/birnetcpu.hh   |   14 ---
 birnet/birnettests.h  |    3 +-
 birnet/birnetutils.cc |    2 -
 6 files changed, 1 insertions(+), 299 deletions(-)
---
diff --git a/birnet/Makefile.am b/birnet/Makefile.am
index ea3d918..94e0cf7 100644
--- a/birnet/Makefile.am
+++ b/birnet/Makefile.am
@@ -10,7 +10,6 @@ GLIB_MKENUMS    = glib-mkenums
 birnet_headers = $(strip               \
        birnet.hh                       \
        birnetcdefs.h                   \
-       birnetcpu.hh                    \
        birnetdebugtools.hh             \
        birnetmsg.hh                    \
        birnettests.h                   \
@@ -19,7 +18,6 @@ birnet_headers = $(strip              \
        birnetutils.hh                  \
 )
 birnet_sources = $(strip               \
-       birnetcpu.cc                    \
        birnetdebugtools.cc             \
        birnetmsg.cc                    \
        birnetmath.cc                   \
diff --git a/birnet/birnet.hh b/birnet/birnet.hh
index 52cbc2b..9f6a095 100644
--- a/birnet/birnet.hh
+++ b/birnet/birnet.hh
@@ -2,7 +2,6 @@
 #ifndef __BIRNET_H__
 #define __BIRNET_H__
 #include <birnet/birnetconfig.h>
-#include <birnet/birnetcpu.hh>
 #include <birnet/birnetdebugtools.hh>
 #include <birnet/birnetmsg.hh>
 #include <birnet/birnetmath.hh>
diff --git a/birnet/birnettests.h b/birnet/birnettests.h
index 34718bd..e2e943e 100644
--- a/birnet/birnettests.h
+++ b/birnet/birnettests.h
@@ -303,8 +303,7 @@ birnet_init_test (int    *argc,
   birnet_init (argc, argv, NULL, ivalues);
   unsigned int flags = g_log_set_always_fatal ((GLogLevelFlags) G_LOG_FATAL_MASK);
   g_log_set_always_fatal ((GLogLevelFlags) (flags | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL));
-  CPUInfo ci = cpu_info();
-  treport_cpu_name (ci.machine);
+  // treport_cpu_name (ci.machine);
   if (init_settings().test_perf)
     g_printerr ("PERF: %s\n", g_get_prgname());
   else
diff --git a/birnet/birnetutils.cc b/birnet/birnetutils.cc
index 21f4b36..4dc92ec 100644
--- a/birnet/birnetutils.cc
+++ b/birnet/birnetutils.cc
@@ -3,7 +3,6 @@
 #include "birnetutils.hh"
 #include "birnetutf8.hh"
 #include "birnetmsg.hh"
-#include "birnetcpu.hh"
 #include <unistd.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -168,7 +167,6 @@ birnet_init (int        *argcp,
     srand (lrand48());
   }
   /* initialize sub systems */
-  _birnet_init_cpuinfo();
   if (run_init_hooks)
     run_init_hooks();
 }