Browse Source

[trac1040] Renamed xxxdef.mes files to xxx_messages.mes

Note: impldef.mes was renamed to logimpl_messages.mes to better
reflect the contents.
Stephen Morris 14 years ago
parent
commit
4565ca4899

+ 4 - 4
src/lib/log/Makefile.am

@@ -8,7 +8,7 @@ CLEANFILES = *.gcno *.gcda
 lib_LTLIBRARIES = liblog.la
 liblog_la_SOURCES  =
 liblog_la_SOURCES += dummylog.h dummylog.cc
-liblog_la_SOURCES += impldef.cc impldef.h
+liblog_la_SOURCES += logimpl_messages.cc logimpl_messages.h
 liblog_la_SOURCES += log_formatter.h log_formatter.cc
 liblog_la_SOURCES += logger.cc logger.h
 liblog_la_SOURCES += logger_impl.cc logger_impl.h
@@ -21,7 +21,7 @@ liblog_la_SOURCES += logger_name.cc logger_name.h
 liblog_la_SOURCES += logger_specification.h
 liblog_la_SOURCES += logger_support.cc logger_support.h
 liblog_la_SOURCES += macros.h
-liblog_la_SOURCES += messagedef.cc messagedef.h
+liblog_la_SOURCES += log_messages.cc log_messages.h
 liblog_la_SOURCES += message_dictionary.cc message_dictionary.h
 liblog_la_SOURCES += message_exception.h
 liblog_la_SOURCES += message_initializer.cc message_initializer.h
@@ -30,8 +30,8 @@ liblog_la_SOURCES += message_types.h
 liblog_la_SOURCES += output_option.cc output_option.h
 
 EXTRA_DIST  = README
-EXTRA_DIST += impldef.mes
-EXTRA_DIST += messagedef.mes
+EXTRA_DIST += logimpl_messages.mes
+EXTRA_DIST += log_messages.mes
 
 # Note: the ordering matters: -Wno-... must follow -Wextra (defined in
 # B10_CXXFLAGS)

+ 1 - 1
src/lib/log/compiler/message.cc

@@ -28,10 +28,10 @@
 #include <util/filename.h>
 #include <util/strutil.h>
 
+#include <log/log_messages.h>
 #include <log/message_dictionary.h>
 #include <log/message_exception.h>
 #include <log/message_reader.h>
-#include <log/messagedef.h>
 
 #include <log/logger.h>
 

+ 1 - 1
src/lib/log/messagedef.cc

@@ -1,4 +1,4 @@
-// File created from messagedef.mes on Fri May 27 14:49:45 2011
+// File created from log_messages.mes on Wed Jun 22 10:38:51 2011
 
 #include <cstddef>
 #include <log/message_types.h>

+ 4 - 4
src/lib/log/messagedef.h

@@ -1,7 +1,7 @@
-// File created from messagedef.mes on Fri May 27 14:49:45 2011
+// File created from log_messages.mes on Wed Jun 22 10:38:51 2011
 
-#ifndef __MESSAGEDEF_H
-#define __MESSAGEDEF_H
+#ifndef __LOG_MESSAGES_H
+#define __LOG_MESSAGES_H
 
 #include <log/message_types.h>
 
@@ -32,4 +32,4 @@ extern const isc::log::MessageID MSG_WRITERR;
 } // namespace log
 } // namespace isc
 
-#endif // __MESSAGEDEF_H
+#endif // __LOG_MESSAGES_H

src/lib/log/messagedef.mes → src/lib/log/log_messages.mes


+ 1 - 1
src/lib/log/logger_level.cc

@@ -14,7 +14,7 @@
 
 #include <log/logger_level.h>
 #include <log/macros.h>
-#include <log/messagedef.h>
+#include <log/log_messages.h>
 
 #include <boost/algorithm/string.hpp>
 

+ 1 - 1
src/lib/log/logger_level_impl.cc

@@ -19,9 +19,9 @@
 
 #include <log4cplus/logger.h>
 
-#include <log/impldef.h>
 #include <log/logger_level.h>
 #include <log/logger_level_impl.h>
+#include <log/logimpl_messages.h>
 #include <log/macros.h>
 
 using namespace log4cplus;

+ 4 - 5
src/lib/log/logger_manager.cc

@@ -16,18 +16,17 @@
 #include <vector>
 
 #include <log/logger.h>
-#include <log/logger_manager_impl.h>
 #include <log/logger_manager.h>
+#include <log/logger_manager_impl.h>
 #include <log/logger_name.h>
-#include <log/messagedef.h>
+#include <log/log_messages.h>
+#include <log/macros.h>
 #include <log/message_dictionary.h>
 #include <log/message_exception.h>
 #include <log/message_initializer.h>
+#include <log/message_initializer.h>
 #include <log/message_reader.h>
 #include <log/message_types.h>
-#include <log/macros.h>
-#include <log/messagedef.h>
-#include <log/message_initializer.h>
 
 using namespace std;
 

+ 7 - 7
src/lib/log/logger_manager_impl.cc

@@ -21,13 +21,13 @@
 #include <log4cplus/fileappender.h>
 #include <log4cplus/syslogappender.h>
 
-#include "log/logger.h"
-#include "log/logger_level_impl.h"
-#include "log/logger_manager.h"
-#include "log/logger_manager_impl.h"
-#include "log/logger_name.h"
-#include "log/logger_specification.h"
-#include "log/messagedef.h"
+#include <log/logger.h>
+#include <log/logger_level_impl.h>
+#include <log/logger_manager.h>
+#include <log/logger_manager_impl.h>
+#include <log/log_messages.h>
+#include <log/logger_name.h>
+#include <log/logger_specification.h>
 
 using namespace std;
 

+ 1 - 1
src/lib/log/impldef.cc

@@ -1,4 +1,4 @@
-// File created from impldef.mes on Wed Jun  1 10:32:57 2011
+// File created from logimpl_messages.mes on Wed Jun 22 10:38:55 2011
 
 #include <cstddef>
 #include <log/message_types.h>

+ 4 - 4
src/lib/log/impldef.h

@@ -1,7 +1,7 @@
-// File created from impldef.mes on Wed Jun  1 10:32:57 2011
+// File created from logimpl_messages.mes on Wed Jun 22 10:38:55 2011
 
-#ifndef __IMPLDEF_H
-#define __IMPLDEF_H
+#ifndef __LOGIMPL_MESSAGES_H
+#define __LOGIMPL_MESSAGES_H
 
 #include <log/message_types.h>
 
@@ -15,4 +15,4 @@ extern const isc::log::MessageID LOGIMPL_BELOWDBGMIN;
 } // namespace log
 } // namespace isc
 
-#endif // __IMPLDEF_H
+#endif // __LOGIMPL_MESSAGES_H

src/lib/log/impldef.mes → src/lib/log/logimpl_messages.mes


+ 1 - 1
src/lib/log/message_reader.cc

@@ -20,8 +20,8 @@
 #include <iostream>
 #include <fstream>
 
+#include <log/log_messages.h>
 #include <log/message_exception.h>
-#include <log/messagedef.h>
 #include <log/message_reader.h>
 #include <util/strutil.h>
 

+ 4 - 3
src/lib/log/output_option.cc

@@ -13,12 +13,13 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 #include <string>
-#include <log/output_option.h>
-#include <log/macros.h>
-#include <log/messagedef.h>
 
 #include <boost/algorithm/string.hpp>
 
+#include <log/log_messages.h>
+#include <log/macros.h>
+#include <log/output_option.h>
+
 namespace isc {
 namespace log {
 

+ 1 - 1
src/lib/log/tests/logger_example.cc

@@ -40,7 +40,7 @@
 #include <log/macros.h>
 
 // Include a set of message definitions.
-#include <log/messagedef.h>
+#include <log/log_messages.h>
 
 using namespace isc::log;
 using namespace std;

+ 1 - 1
src/lib/log/tests/logger_level_unittest.cc

@@ -19,8 +19,8 @@
 
 #include <log/logger.h>
 #include <log/logger_manager.h>
+#include <log/log_messages.h>
 #include <log/logger_name.h>
-#include <log/messagedef.h>
 
 using namespace isc;
 using namespace isc::log;

+ 1 - 1
src/lib/log/tests/logger_manager_unittest.cc

@@ -27,7 +27,7 @@
 #include <exceptions/exceptions.h>
 
 #include <log/macros.h>
-#include <log/messagedef.h>
+#include <log/log_messages.h>
 #include <log/logger.h>
 #include <log/logger_level.h>
 #include <log/logger_manager.h>

+ 1 - 1
src/lib/log/tests/logger_unittest.cc

@@ -20,7 +20,7 @@
 #include <log/logger.h>
 #include <log/logger_manager.h>
 #include <log/logger_name.h>
-#include <log/messagedef.h>
+#include <log/log_messages.h>
 
 using namespace isc;
 using namespace isc::log;

+ 1 - 1
src/lib/log/tests/message_reader_unittest.cc

@@ -16,7 +16,7 @@
 #include <string>
 #include <gtest/gtest.h>
 
-#include <log/messagedef.h>
+#include <log/log_messages.h>
 #include <log/message_dictionary.h>
 #include <log/message_exception.h>
 #include <log/message_reader.h>