diff --git a/direct/src/distributed/cConnectionRepository.I b/direct/src/distributed/cConnectionRepository.I index 12c10446dc..b6d2f2e177 100644 --- a/direct/src/distributed/cConnectionRepository.I +++ b/direct/src/distributed/cConnectionRepository.I @@ -249,7 +249,6 @@ get_simulated_disconnect() const { return _simulated_disconnect; } -#ifndef NDEBUG //////////////////////////////////////////////////////////////////// // Function: CConnectionRepository::toggle_verbose // Access: Published @@ -261,9 +260,7 @@ INLINE void CConnectionRepository:: toggle_verbose() { _verbose = !_verbose; } -#endif // NDEBUG -#ifndef NDEBUG //////////////////////////////////////////////////////////////////// // Function: CConnectionRepository::set_verbose // Access: Published @@ -275,9 +272,7 @@ INLINE void CConnectionRepository:: set_verbose(bool verbose) { _verbose = verbose; } -#endif // NDEBUG -#ifndef NDEBUG //////////////////////////////////////////////////////////////////// // Function: CConnectionRepository::get_verbose // Access: Published @@ -289,4 +284,3 @@ INLINE bool CConnectionRepository:: get_verbose() const { return _verbose; } -#endif // NDEBUG diff --git a/direct/src/distributed/cConnectionRepository.cxx b/direct/src/distributed/cConnectionRepository.cxx index 2f43a10281..fde85af91b 100644 --- a/direct/src/distributed/cConnectionRepository.cxx +++ b/direct/src/distributed/cConnectionRepository.cxx @@ -235,11 +235,9 @@ check_datagram() { _bdc.Flush(); #endif //WANT_NATIVE_NET while (do_check_datagram()) { //Read a datagram -#ifndef NDEBUG if (get_verbose()) { describe_message(nout, "receive ", _dg.get_message()); } -#endif // NDEBUG // Start breaking apart the datagram. _di = DatagramIterator(_dg); @@ -362,11 +360,9 @@ send_datagram(const Datagram &dg) { return false; } -#ifndef NDEBUG if (get_verbose()) { describe_message(nout, "send ", dg.get_message()); } -#endif // NDEBUG #ifdef WANT_NATIVE_NET if(_native) @@ -698,7 +694,6 @@ handle_update_field_owner() { return true; } -#ifndef NDEBUG //////////////////////////////////////////////////////////////////// // Function: CConnectionRepository::describe_message // Access: Private @@ -793,5 +788,4 @@ describe_message(ostream &out, const string &prefix, } } } -#endif // NDEBUG diff --git a/direct/src/distributed/cConnectionRepository.h b/direct/src/distributed/cConnectionRepository.h index 1b6d780f2c..ef4e95e877 100644 --- a/direct/src/distributed/cConnectionRepository.h +++ b/direct/src/distributed/cConnectionRepository.h @@ -120,21 +120,17 @@ PUBLISHED: INLINE void set_simulated_disconnect(bool simulated_disconnect); INLINE bool get_simulated_disconnect() const; -#ifndef NDEBUG INLINE void toggle_verbose(); INLINE void set_verbose(bool verbose); INLINE bool get_verbose() const; -#endif // NDEBUG private: bool do_check_datagram(); bool handle_update_field(); bool handle_update_field_owner(); -#ifndef NDEBUG void describe_message(ostream &out, const string &prefix, const string &message_data) const; -#endif // NDEBUG #ifdef HAVE_PYTHON PyObject *_python_repository;