Skip to content

Nolog4cxx #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maihde wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Nolog4cxx #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
456c733
Fix configure.ac setup for logging.
Feb 9, 2014
049e713
Get bulkio bases to build when LOG4CXX is not used by the core.
Feb 9, 2014
0e3f6b6
Make TRACE_ENTER and TRACE_EXIT use __PRETTY_FUNCTION__
Feb 9, 2014
67eef51
Fix reorder warnings
Feb 9, 2014
a066e31
Don't warn about our own deprecations.
Feb 9, 2014
044e1aa
Fix major issue where the timestramp create call was not returning a …
Feb 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,23 @@ PKG_CHECK_MODULES([OSSIE], [ossie >= 1.8.0])
AC_ARG_ENABLE([base-classes], AS_HELP_STRING([--disable-base-classes], [Disable BULKIO base class libraries]))
AM_CONDITIONAL([BUILD_BASE_CLASSES], [test "$enable_base_classes" != "no"])

AC_ARG_ENABLE(logging, AS_HELP_STRING([--disable-logging], [Disable bulkio base class logging]))
AM_CONDITIONAL([DISABLE_LOGGING], [test "$disable_logging" != "no"])

if test "$enable_base_classes" != "no"; then
AC_SUBST([BULKIO_SO_VERSION], [0:0:0])
AC_SUBST([BULKIO_API_VERSION], [1.0])

AX_BOOST_BASE([1.41])
AX_BOOST_THREAD
OSSIE_ENABLE_LOG4CXX
CHECK_VECTOR_IMPL

if test "x$disable_logging" != "xno"; then
CPPFLAGS="${CPPFLAGS} -DLOGGING=1"
else
CPPFLAGS="${CPPFLAGS} -DLOGGING=0"
fi

AC_SUBST(BULKIO_INF_INCLUDES, "-I../src/cpp -I../src/cpp/ossie")
AC_SUBST(BULKIO_INF_CFLAGS, )
AC_SUBST(BULKIO_INF_LIBS, )
Expand Down
2 changes: 1 addition & 1 deletion libsrc/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ library_include_HEADERS = cpp/bulkio.h \
## shipped with the source tarball.
#bulkio_libincludedir = $(libdir)/bulkio-$(BULKIO_API_VERSION)/include

libbulkio_@BULKIO_API_VERSION@_la_CXXFLAGS = -Wall -I./cpp -DLOGGING $(BULKIO_INF_INCLUDES) $(BOOST_CPPFLAGS) $(OMNIORB_CFLAGS) $(OSSIE_CFLAGS)
libbulkio_@BULKIO_API_VERSION@_la_CXXFLAGS = -Wall -Wno-deprecated-declarations -I./cpp $(BULKIO_INF_INCLUDES) $(BOOST_CPPFLAGS) $(OMNIORB_CFLAGS) $(OSSIE_CFLAGS)

###############################################################################
# Python
Expand Down
7 changes: 5 additions & 2 deletions libsrc/cpp/bulkio_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <boost/thread/condition_variable.hpp>
#include <boost/thread/locks.hpp>
#include <boost/thread/locks.hpp>
#include <log4cxx/logger.h>
#include <ossie/debug.h>
#include <ossie/BULKIO/bio_runtimeStats.h>
#include <ossie/BULKIO/bulkioDataTypes.h>

Expand Down Expand Up @@ -85,8 +85,11 @@ namespace bulkio {
//
// Logging interface definition
//
#if HAVE_LOG4CXX
typedef log4cxx::LoggerPtr LOGGER_PTR;

#else
typedef std::string LOGGER_PTR;
#endif

//
// Base Types used by Ports
Expand Down
Loading