From f808a2866428757835856da2a5811d29616778f5 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Sun, 22 Apr 2018 16:22:02 -0700 Subject: [PATCH] ircd: Add m/m.h to stdinc.h --- include/ircd/stdinc.h | 1 + ircd/m/dbs.cc | 2 -- ircd/m/event.cc | 2 -- ircd/m/filter.cc | 2 -- ircd/m/id.cc | 1 - ircd/m/m.cc | 2 -- ircd/m/request.cc | 2 -- ircd/m/room.cc | 2 -- ircd/m/state.cc | 2 -- ircd/m/v1.cc | 2 -- ircd/m/vm.cc | 2 -- ircd/resource.cc | 2 -- modules/Makefile.am | 1 - 13 files changed, 1 insertion(+), 22 deletions(-) diff --git a/include/ircd/stdinc.h b/include/ircd/stdinc.h index e8b0b34c8..14b012eff 100644 --- a/include/ircd/stdinc.h +++ b/include/ircd/stdinc.h @@ -228,5 +228,6 @@ namespace ircd #include "rfc1035.h" #include "net/net.h" #include "server/server.h" +#include "m/m.h" #include "resource.h" #include "client.h" diff --git a/ircd/m/dbs.cc b/ircd/m/dbs.cc index 6a468c190..2ed47e533 100644 --- a/ircd/m/dbs.cc +++ b/ircd/m/dbs.cc @@ -8,8 +8,6 @@ // copyright notice and this permission notice is present in all copies. The // full license for this software is available in the LICENSE file. -#include - /// Residence of the events database instance pointer. decltype(ircd::m::dbs::events) ircd::m::dbs::events diff --git a/ircd/m/event.cc b/ircd/m/event.cc index ec3eed823..0e14d7328 100644 --- a/ircd/m/event.cc +++ b/ircd/m/event.cc @@ -8,8 +8,6 @@ // copyright notice and this permission notice is present in all copies. The // full license for this software is available in the LICENSE file. -#include - bool ircd::m::operator==(const event &a, const event &b) { diff --git a/ircd/m/filter.cc b/ircd/m/filter.cc index 7b4f263c0..1926fd626 100644 --- a/ircd/m/filter.cc +++ b/ircd/m/filter.cc @@ -8,8 +8,6 @@ // copyright notice and this permission notice is present in all copies. The // full license for this software is available in the LICENSE file. -#include - //TODO: globular expression bool ircd::m::match(const room_event_filter &filter, diff --git a/ircd/m/id.cc b/ircd/m/id.cc index 7b49eea0b..b83d4b28e 100644 --- a/ircd/m/id.cc +++ b/ircd/m/id.cc @@ -9,7 +9,6 @@ // full license for this software is available in the LICENSE file. #include -#include namespace ircd::m { diff --git a/ircd/m/m.cc b/ircd/m/m.cc index 13ba5d9a5..5f5d97ea1 100644 --- a/ircd/m/m.cc +++ b/ircd/m/m.cc @@ -8,8 +8,6 @@ // copyright notice and this permission notice is present in all copies. The // full license for this software is available in the LICENSE file. -#include - namespace ircd::m { static void leave_ircd_room(); diff --git a/ircd/m/request.cc b/ircd/m/request.cc index d5535e097..313a8af00 100644 --- a/ircd/m/request.cc +++ b/ircd/m/request.cc @@ -8,8 +8,6 @@ // copyright notice and this permission notice is present in all copies. The // full license for this software is available in the LICENSE file. -#include - // // request // diff --git a/ircd/m/room.cc b/ircd/m/room.cc index cc7c6c168..5f4a5729b 100644 --- a/ircd/m/room.cc +++ b/ircd/m/room.cc @@ -8,8 +8,6 @@ // copyright notice and this permission notice is present in all copies. The // full license for this software is available in the LICENSE file. -#include - int64_t ircd::m::depth(const id::room &room_id) { diff --git a/ircd/m/state.cc b/ircd/m/state.cc index 84e48c0bf..d9ddf068b 100644 --- a/ircd/m/state.cc +++ b/ircd/m/state.cc @@ -8,8 +8,6 @@ // copyright notice and this permission notice is present in all copies. The // full license for this software is available in the LICENSE file. -#include - /// Convenience to make a key and then get a value void ircd::m::state::get(const string_view &root, diff --git a/ircd/m/v1.cc b/ircd/m/v1.cc index 62bbd5540..2765de04c 100644 --- a/ircd/m/v1.cc +++ b/ircd/m/v1.cc @@ -8,8 +8,6 @@ // copyright notice and this permission notice is present in all copies. The // full license for this software is available in the LICENSE file. -#include - /////////////////////////////////////////////////////////////////////////////// // // v1/groups.h diff --git a/ircd/m/vm.cc b/ircd/m/vm.cc index 6747eba22..fe589630a 100644 --- a/ircd/m/vm.cc +++ b/ircd/m/vm.cc @@ -8,8 +8,6 @@ // copyright notice and this permission notice is present in all copies. The // full license for this software is available in the LICENSE file. -#include - decltype(ircd::m::vm::log) ircd::m::vm::log { diff --git a/ircd/resource.cc b/ircd/resource.cc index 9bb29e7ae..bf2236f31 100644 --- a/ircd/resource.cc +++ b/ircd/resource.cc @@ -8,8 +8,6 @@ // copyright notice and this permission notice is present in all copies. The // full license for this software is available in the LICENSE file. -#include - decltype(ircd::resource::resources) ircd::resource::resources {}; diff --git a/modules/Makefile.am b/modules/Makefile.am index 2f917bb4f..bb90c1f51 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS = \ @JS_CPPFLAGS@ \ @BOOST_CPPFLAGS@ \ -include $(top_srcdir)/include/ircd/ircd.h \ - -include $(top_srcdir)/include/ircd/m/m.h \ -include $(top_srcdir)/include/ircd/mapi.h \ ###