summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFreeyorp <TheFreeYorp+git@gmail.com>2024-06-19 12:58:58 +0000
committerFreeyorp <TheFreeYorp+git@gmail.com>2024-06-19 13:00:17 +0000
commit8a6da3aae88d4976fca21138a4d0bcfc1a1a40af (patch)
tree7f754ede906880956206179272822ec9b4dcf041
parent70ca9f9fa9adb60014e1c7f6e420c327ecd94a39 (diff)
downloadtmwa-one-time-black-magic.tar.gz
tmwa-one-time-black-magic.tar.bz2
tmwa-one-time-black-magic.tar.xz
tmwa-one-time-black-magic.zip
WIP: ODR warning investigationone-time-black-magic
This attempts to establish an upper bound for an isolated test case, using `NotAccountEmail` instead of `AccountEmail`. The warning is not currently triggered by building this psuedo-server.
-rw-r--r--CMakeLists.txt12
-rw-r--r--src/teststorageclass/fwd.hpp36
-rw-r--r--src/teststorageclass/main.cpp37
-rw-r--r--src/teststorageclass/teststorageclass.cpp41
-rw-r--r--src/teststorageclass/teststorageclass.hpp34
5 files changed, 159 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79413ee..73a10a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,7 @@ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
# For each subfolder in src, add all .cpp files to a subfolder's SOURCES
# variable.
set(ALL_SOURCES "")
-foreach(dir admin ast char compat conf generic high ints io login map mmo net proto-base range sexpr shared strings tests wire strtest)
+foreach(dir admin ast char compat conf generic high ints io login map mmo net proto-base range sexpr shared strings tests wire strtest teststorageclass)
file(GLOB_RECURSE ${dir}_SOURCES CONFIGURE_DEPENDS src/${dir}/*.cpp)
# Exclude any _test.cpp files from the build
set(ALL_SOURCES ${ALL_SOURCES} ${${dir}_SOURCES})
@@ -168,6 +168,16 @@ add_executable(tmwa-admin ${admin_SOURCES}
)
target_link_libraries(tmwa-admin tmwa-shared)
+add_executable(tmwa-teststorageclass ${teststorageclass_SOURCES}
+ ${generic_SOURCES}
+ ${high_SOURCES}
+ ${io_SOURCES}
+ ${mmo_SOURCES}
+ ${net_SOURCES}
+ ${wire_SOURCES}
+)
+target_link_libraries(tmwa-teststorageclass tmwa-shared)
+
# TODO: Call make -f ${CMAKE_SOURCE_DIR}/generate.mk clean to clean up the
# generated files. We want this to be run every time we call make clean.
diff --git a/src/teststorageclass/fwd.hpp b/src/teststorageclass/fwd.hpp
new file mode 100644
index 0000000..bd82d0b
--- /dev/null
+++ b/src/teststorageclass/fwd.hpp
@@ -0,0 +1,36 @@
+#pragma once
+// teststorageclass/fwd.hpp - list of type names for mmo lib
+//
+// Copyright © 2014 Ben Longbons <b.r.longbons@gmail.com>
+//
+// This file is part of The Mana World (Athena server)
+//
+// 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
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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/>.
+
+#include "../sanity.hpp"
+
+#include "../ints/fwd.hpp" // rank 1
+#include "../strings/fwd.hpp" // rank 1
+#include "../compat/fwd.hpp" // rank 2
+#include "../generic/fwd.hpp" // rank 3
+#include "../io/fwd.hpp" // rank 4
+#include "../net/fwd.hpp" // rank 5
+// mmo/fwd.hpp is rank 6
+
+
+namespace tmwa
+{
+// meh, add more when I feel like it
+class NotAccountEmail;
+} // namespace tmwa
diff --git a/src/teststorageclass/main.cpp b/src/teststorageclass/main.cpp
new file mode 100644
index 0000000..b0334f3
--- /dev/null
+++ b/src/teststorageclass/main.cpp
@@ -0,0 +1,37 @@
+// map/main.cpp - entry point to tmwa-teststorageclass
+//
+// Copyright © 2013-2014 Ben Longbons <b.r.longbons@gmail.com>
+//
+// This file is part of The Mana World (Athena server)
+//
+// 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
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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/>.
+
+#include "../high/core.hpp"
+
+#include "teststorageclass.hpp"
+
+#include "../poison.hpp"
+
+
+namespace tmwa
+{
+namespace map
+{
+} // namespace map
+} // namespace tmwa
+
+int main(int argc, char **argv)
+{
+ return tmwa_main(argc, argv);
+}
diff --git a/src/teststorageclass/teststorageclass.cpp b/src/teststorageclass/teststorageclass.cpp
new file mode 100644
index 0000000..d0da67a
--- /dev/null
+++ b/src/teststorageclass/teststorageclass.cpp
@@ -0,0 +1,41 @@
+#include "teststorageclass.hpp"
+// teststorageclass.cpp - common string types
+//
+// Copyright © 2014 Ben Longbons <b.r.longbons@gmail.com>
+//
+// This file is part of The Mana World (Athena server)
+//
+// 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
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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/>.
+
+
+#include "fwd.hpp"
+
+#include "../io/cxxstdio.hpp"
+#include "../net/socket.hpp"
+#include "../range/slice.hpp"
+#include "../strings/fwd.hpp"
+
+#include "../poison.hpp"
+
+namespace tmwa {
+
+// Minimal compliance with the tmwa server interface
+void SessionDeleter::operator()(SessionData *sd) {}
+int do_init(Slice<ZString> argv) { return 0; }
+void term_func(void) {}
+
+const struct NotAccountEmail NOT_DEFAULT_EMAIL = stringish<NotAccountEmail>("a@a.com"_s);
+
+
+} // namespace tmwa
diff --git a/src/teststorageclass/teststorageclass.hpp b/src/teststorageclass/teststorageclass.hpp
new file mode 100644
index 0000000..11cb1e2
--- /dev/null
+++ b/src/teststorageclass/teststorageclass.hpp
@@ -0,0 +1,34 @@
+#pragma once
+// teststorageclass.hpp - common string types
+//
+// Copyright © ????-2004 Athena Dev Teams
+// Copyright © 2004-2011 The Mana World Development Team
+// Copyright © 2011-2014 Ben Longbons <b.r.longbons@gmail.com>
+//
+// This file is part of The Mana World (Athena server)
+//
+// 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
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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/>.
+
+#include "fwd.hpp"
+
+#include "../strings/vstring.hpp"
+
+class NotAccountEmail;
+
+namespace tmwa
+{
+struct NotAccountEmail : VString<39> {};
+
+extern const struct NotAccountEmail NOT_DEFAULT_EMAIL;
+} // namespace tmwa