New version : 2018.3.4

Aircraft model reinit deletes sound effect samples, but leaves them defined in the sample group, so a reload doesn't re-add them.
[soundmgr_openal] Pause/Resume Sound.
2019-08-07 09:58:45 +01:00 · 2019-07-30 16:36:49 +01:00 · 2019-07-30 16:36:49 +01:00 · 2019-07-30 16:36:49 +01:00 · 2019-07-30 16:36:49 +01:00 · 2019-07-28 22:43:16 +02:00
302 changed files with 6172 additions and 17712 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,3 @@ install_manifest.txt
 build*
 Build
 CMakeLists.txt.user
-3rdparty/expat_2.2.6/
-nbproject
--- a/3rdparty/expat/CMakeLists.txt
+++ b/3rdparty/expat/CMakeLists.txt
@@ -1,7 +1,7 @@

 configure_file (
    "${PROJECT_SOURCE_DIR}/3rdparty/expat/expat_config_cmake.in"
-    "${PROJECT_BINARY_DIR}/3rdparty/expat/simgear_expat_config.h"
+    "${PROJECT_BINARY_DIR}/3rdparty/expat/expat_config.h"
 )

 set(expat_sources 
--- a/3rdparty/expat/xmlparse.c
+++ b/3rdparty/expat/xmlparse.c
@@ -18,8 +18,6 @@
 #include "amigaconfig.h"
 #elif defined(__WATCOMC__)
 #include "watcomconfig.h"
-#elif defined(HAVE_SIMGEAR_EXPAT_CONFIG_H)
-#include "simgear_expat_config.h"
 #elif defined(HAVE_EXPAT_CONFIG_H)
 #include "expat_config.h"
 #endif /* ndef COMPILED_FROM_DSP */
--- a/3rdparty/expat/xmlrole.c
+++ b/3rdparty/expat/xmlrole.c
@@ -12,8 +12,6 @@
 #include "amigaconfig.h"
 #elif defined(__WATCOMC__)
 #include "watcomconfig.h"
-#elif defined(HAVE_SIMGEAR_EXPAT_CONFIG_H)
-#include "simgear_expat_config.h"
 #else
 #ifdef HAVE_EXPAT_CONFIG_H
 #include "expat_config.h"
--- a/3rdparty/expat/xmltok.c
+++ b/3rdparty/expat/xmltok.c
@@ -12,8 +12,6 @@
 #include "amigaconfig.h"
 #elif defined(__WATCOMC__)
 #include "watcomconfig.h"
-#elif defined(HAVE_SIMGEAR_EXPAT_CONFIG_H)
-#include "simgear_expat_config.h"
 #else
 #ifdef HAVE_EXPAT_CONFIG_H
 #include "expat_config.h"
--- a/3rdparty/udns/udns_init.c
+++ b/3rdparty/udns/udns_init.c
@@ -24,7 +24,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#if defined(_WINDOWS) || defined(WINDOWS)
+#ifdef WINDOWS
 # include <winsock2.h>          /* includes <windows.h> */
 # include <iphlpapi.h>		/* for dns server addresses etc */
 #else
@@ -53,7 +53,7 @@ static void dns_set_srch_internal(struct dns_ctx *ctx, char *srch) {
    dns_add_srch(ctx, srch);
 }

-#if defined(_WINDOWS) || defined(WINDOWS)
+#ifdef WINDOWS

 #ifndef NO_IPHLPAPI
 /* Apparently, some systems does not have proper headers for IPHLPAIP to work.
@@ -217,7 +217,7 @@ int dns_init(struct dns_ctx *ctx, int do_open) {
    ctx = &dns_defctx;
  dns_reset(ctx);

-#if defined(_WINDOWS) || defined(WINDOWS)
+#ifdef WINDOWS
  if (dns_initns_iphlpapi(ctx) != 0)
    dns_initns_registry(ctx);
  /*XXX WINDOWS: probably good to get default domain and search list too...
--- a/3rdparty/udns/udns_resolver.c
+++ b/3rdparty/udns/udns_resolver.c
@@ -24,7 +24,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#if defined(_WINDOWS) || defined(WINDOWS)
+#ifdef WINDOWS
 # include <winsock2.h>          /* includes <windows.h> */
 # include <ws2tcpip.h>          /* needed for struct in6_addr */
 #else
@@ -392,7 +392,7 @@ dns_set_tmcbck(struct dns_ctx *ctx, dns_utm_fn *fn, void *data) {
 }

 static unsigned dns_nonrandom_32(void) {
-#if defined(_WINDOWS) || defined(WINDOWS)
+#ifdef WINDOWS
  FILETIME ft;
  GetSystemTimeAsFileTime(&ft);
  return ft.dwLowDateTime;
@@ -551,7 +551,7 @@ int dns_open(struct dns_ctx *ctx) {
    ctx->dnsc_qstatus = DNS_E_TEMPFAIL;
    return -1;
  }
-#if defined(_WINDOWS) || defined(WINDOWS)
+#ifdef WINDOWS
  { unsigned long on = 1;
    if (ioctlsocket(sock, FIONBIO, &on) == SOCKET_ERROR) {
      closesocket(sock);
@@ -991,7 +991,7 @@ again: /* receive the reply */
     * or remote.  On local errors, we should stop, while
     * remote errors should be ignored (for now anyway).
     */
-#if defined(_WINDOWS) || defined(WINDOWS)
+#ifdef WINDOWS
    if (WSAGetLastError() == WSAEWOULDBLOCK)
 #else
    if (errno == EAGAIN)
--- a/3rdparty/udns/udns_rr_a.c
+++ b/3rdparty/udns/udns_rr_a.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#if !defined(_WINDOWS) && !defined(WINDOWS)
+#ifndef WINDOWS
 # include <sys/types.h>
 # include <netinet/in.h>
 #endif
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,15 +10,6 @@ if(COMMAND cmake_policy)
   if(POLICY CMP0067)
       cmake_policy(SET CMP0067 NEW)
   endif()
-    
-  # OpenGL VND policy : use the old definition for now, until we can audit this
-  if(POLICY CMP0072)
-        cmake_policy(SET CMP0072 OLD)
-  endif()
-
-   if(POLICY CMP0093)
-       cmake_policy(SET CMP0093 NEW)
-   endif()
 endif()


@@ -49,7 +40,7 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)

 # read 'version' file into a variable (stripping any newlines or spaces)
-file(READ simgear-version versionFile)
+file(READ version versionFile)
 string(STRIP ${versionFile} SIMGEAR_VERSION)

 project(SimGear VERSION ${SIMGEAR_VERSION} LANGUAGES C CXX)
@@ -143,7 +134,6 @@ if (NOT ENABLE_SIMD AND ENABLE_SIMD_CODE)
 endif()

 include (DetectArch)
-include (ExportDebugSymbols)

 # until the fstream fix is applied and generally available in OSG,
 # keep the compatability link option as the default
@@ -160,7 +150,7 @@ endif()


 if (MSVC)
-  GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_BINARY_DIR} DIRECTORY)
+  GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_BINARY_DIR} PATH)
  if (CMAKE_CL_64)
    SET(TEST_3RDPARTY_DIR "${PARENT_DIR}/3rdparty.x64")
  else (CMAKE_CL_64)
@@ -171,11 +161,6 @@ if (MSVC)
  else (EXISTS ${TEST_3RDPARTY_DIR})
    set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted")
  endif (EXISTS ${TEST_3RDPARTY_DIR})
-
-  # override CMake default RelWithDebInfo flags. This is important to ensure
-  # good performance
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Zi /O2 /Ob2 /D NDEBUG")
-  set(CMAKE_C_FLAGS_RELWITHDEBINFO "/Zi /O2 /Ob2 /D NDEBUG")
 else (MSVC)
  set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted")
 endif (MSVC)
@@ -188,17 +173,15 @@ if (MSVC AND MSVC_3RDPARTY_ROOT)

  set( OSG_MSVC "msvc" )
  if (${MSVC_VERSION_MAJOR} EQUAL "19")
-    if (${MSVC_VERSION_MINOR} GREATER_EQUAL "20")
-      set( OSG_MSVC ${OSG_MSVC}142 )
-    elseif (${MSVC_VERSION_MINOR} GREATER_EQUAL "10")
-      set( OSG_MSVC ${OSG_MSVC}141 )
-    else ()
+    if (${MSVC_VERSION_MINOR} EQUAL "00")
      set( OSG_MSVC ${OSG_MSVC}140 )
+    else ()
+      set( OSG_MSVC ${OSG_MSVC}141 )
    endif ()
  elseif (${MSVC_VERSION_MAJOR} EQUAL "18")
    set( OSG_MSVC ${OSG_MSVC}120 )
  else ()
-    message(FATAL_ERROR "Visual Studio 2013 or higher is required")
+    message(FATAL_ERROR "Visual Studio 2013/15/17 is required")
  endif ()

  if (CMAKE_CL_64)
@@ -215,7 +198,7 @@ if (MSVC AND MSVC_3RDPARTY_ROOT)
    # if this variable was not set by the user, set it to 3rdparty root's
    # parent dir, which is the normal location for people using our
    # windows-3rd-party repo
-    get_filename_component(MSVC_ROOT_PARENT_DIR ${MSVC_3RDPARTY_ROOT} DIRECTORY)
+    GET_FILENAME_COMPONENT(MSVC_ROOT_PARENT_DIR ${MSVC_3RDPARTY_ROOT} PATH)
    set(BOOST_INCLUDEDIR ${MSVC_ROOT_PARENT_DIR})
    message(STATUS "BOOST_INCLUDEDIR is ${BOOST_INCLUDEDIR}")
  endif()
@@ -233,7 +216,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD
 endif()

 find_package(Boost REQUIRED)
-set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION -DBOOST_NO_STDLIB_CONFIG")
+set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
 include(BoostTestTargets)

 if(SIMGEAR_HEADLESS)
@@ -278,14 +261,7 @@ else()
    endif()
 endif(SIMGEAR_HEADLESS)

-if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-    # As of 2020-08-01, OpenBSD's system zlib is slightly old, but it's usable
-    # with a workaround in simgear/io/iostreams/gzfstream.cxx.
-    find_package(ZLIB 1.2.3 REQUIRED)
-else()
-    find_package(ZLIB 1.2.4 REQUIRED)
-endif()
-
+find_package(ZLIB 1.2.4 REQUIRED)
 find_package(CURL REQUIRED)

 if (SYSTEM_EXPAT)
@@ -295,6 +271,9 @@ if (SYSTEM_EXPAT)

 else()
    message(STATUS "Using built-in expat code")
+    # XML_STATIC is important to avoid sg_expat_external.h
+    # declaring symbols as declspec(import)
+    add_definitions(-DHAVE_EXPAT_CONFIG_H -DXML_STATIC)
    set(EXPAT_INCLUDE_DIRS
            ${PROJECT_SOURCE_DIR}/3rdparty/expat
            ${PROJECT_BINARY_DIR}/3rdparty/expat)
@@ -313,10 +292,11 @@ endif()
 if(ENABLE_RTI)
    find_package(PkgConfig)
    if(PKG_CONFIG_FOUND)
-      SET(ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig:$ENV{PKG_CONFIG_PATH}")
+      SET(ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
      pkg_check_modules(RTI hla-rti13)
    endif(PKG_CONFIG_FOUND)
    if(RTI_FOUND)
+      SET(RTI_INCLUDE_DIR "${RTI_INCLUDE_DIRS}")
      message(STATUS "RTI: ENABLED")
    else()
      message(STATUS "RTI: DISABLED")
@@ -430,8 +410,16 @@ if(CMAKE_COMPILER_IS_GNUCXX)
      message(WARNING "GCC 4.4 will be required soon, please upgrade")
    endif()

-    if (X86 OR X86_64)
-        set(SIMD_COMPILER_FLAGS "-msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+      set(CMAKE_C_FLAGS
+        "${CMAKE_C_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline")
+      set(CMAKE_CXX_FLAGS
+        "${CMAKE_CXX_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline")
+    elseif (ENABLE_SIMD)
+      if (X86 OR X86_64)
+        set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
+        set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
+      endif()
    endif()

    # certain GCC versions don't provide the atomic builds, and hence
@@ -440,10 +428,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
    check_cxx_source_compiles(
       "int main() { unsigned mValue; return __sync_add_and_fetch(&mValue, 1); }"
        GCC_ATOMIC_BUILTINS_FOUND)
-
-      # override CMake default RelWithDebInfo flags.
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO  "-O3 -g -DNDEBUG")
 endif(CMAKE_COMPILER_IS_GNUCXX)

 if (CLANG)
@@ -454,11 +438,17 @@ if (CLANG)
    # fix Boost compilation :(
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")

-    # override CMake default RelWithDebInfo flags.
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO  "-O3 -g -DNDEBUG")
-
-    set(SIMD_COMPILER_FLAGS "-msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+      set(CMAKE_C_FLAGS
+        "${CMAKE_C_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline-functions")
+      set(CMAKE_CXX_FLAGS
+        "${CMAKE_CXX_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline-functions")
+    elseif (ENABLE_SIMD)
+      if (X86 OR X86_64)
+        set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
+        set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
+      endif()
+    endif()
 endif()

 if (ENABLE_OPENMP)
@@ -490,8 +480,14 @@ if(WIN32)

    if(MSVC)
        set(MSVC_FLAGS "-DWIN32 -DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS /MP")
-        if (X86)
-          set(SIMD_COMPILER_FLAGS "/arch:SSE /arch:SSE2")
+        if(ENABLE_SIMD)
+          if (X86)
+            SET(CMAKE_C_FLAGS_RELEASE "/O2 /arch:SSE /arch:SSE2")
+            SET(CMAKE_CXX_FLAGS_RELEASE "/O2 /arch:SSE /arch:SSE2")
+          else()
+            SET(CMAKE_C_FLAGS_RELEASE "/O2")
+            SET(CMAKE_CXX_FLAGS_RELEASE "/O2")
+          endif()
        endif()

        if (NOT OSG_FSTREAM_EXPORT_FIXED)
@@ -515,20 +511,6 @@ if(WIN32)
    set( RT_LIBRARY "winmm" )
 endif(WIN32)

-# append the SIMD flags if requested
-if (ENABLE_SIMD)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SIMD_COMPILER_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SIMD_COMPILER_FLAGS}")
-
-  # set for multi-configuration generators
-  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${SIMD_COMPILER_FLAGS}")
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${SIMD_COMPILER_FLAGS}")
-
-  set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${SIMD_COMPILER_FLAGS}")
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${SIMD_COMPILER_FLAGS}")
-endif()
-
-
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS_C} ${MSVC_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_CXX} ${MSVC_FLAGS} ${BOOST_CXX_FLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}")
@@ -539,10 +521,6 @@ include(CheckCXXFeatures)
 # ahead of system-installed libs
 include_directories(BEFORE ${PROJECT_BINARY_DIR}/simgear)

-if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-    include_directories("/usr/X11R6/include")
-endif()
-
 add_definitions(-DHAVE_CONFIG_H)

 # configure a header file to pass some of the CMake settings
--- a/CMakeModules/BoostTestTargets.cmake
+++ b/CMakeModules/BoostTestTargets.cmake
@@ -46,17 +46,11 @@ set(BOOST_TEST_TARGET_PREFIX "test")
 if(NOT Boost_FOUND)
 	find_package(Boost 1.34.0 QUIET)
 endif()
-
-if (NOT Boost_VERSION_MACRO)
-	# Compatibility with pre CMP0093 (CMake 3.15)
-	set(Boost_VERSION_MACRO ${Boost_VERSION})
-endif()
-
-if("${Boost_VERSION_MACRO}0" LESS "1034000")
+if("${Boost_VERSION}0" LESS "1034000")
 	set(_shared_msg
 		"NOTE: boost::test-based targets and tests cannot "
 		"be added: boost >= 1.34.0 required but not found. "
-		"(found: '${Boost_VERSION_MACRO}'; want >=103400) ")
+		"(found: '${Boost_VERSION}'; want >=103400) ")
 	if(ENABLE_TESTS)
 		message(FATAL_ERROR
 			${_shared_msg}
@@ -72,7 +66,7 @@ endif()
 include(GetForceIncludeDefinitions)
 include(CopyResourcesToBuildTree)

-if(Boost_FOUND AND NOT "${Boost_VERSION_MACRO}0" LESS "1034000")
+if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
 	set(_boosttesttargets_libs)
 	set(_boostConfig "BoostTestTargetsIncluded.h")
 	if(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
@@ -86,7 +80,7 @@ if(Boost_FOUND AND NOT "${Boost_VERSION_MACRO}0" LESS "1034000")
 			set(_boostConfig "BoostTestTargetsDynamic.h")
 		endif()
 	endif()
-	get_filename_component(_moddir ${CMAKE_CURRENT_LIST_FILE} DIRECTORY)
+	get_filename_component(_moddir ${CMAKE_CURRENT_LIST_FILE} PATH)
 	configure_file("${_moddir}/${_boostConfig}"
 		"${CMAKE_CURRENT_BINARY_DIR}/BoostTestTargetConfig.h"
 		COPYONLY)
@@ -135,7 +129,7 @@ function(add_boost_test _name)
 			"Syntax error in use of add_boost_test: at least one source file required!")
 	endif()

-	if(Boost_FOUND AND NOT "${Boost_VERSION_MACRO}0" LESS "1034000")
+	if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")

 		include_directories(${Boost_INCLUDE_DIRS})

@@ -227,7 +221,7 @@ function(add_boost_test _name)
 			set(_test_command ${_target_name})
 		endif()

-		if(TESTS AND ( "${Boost_VERSION_MACRO}" VERSION_GREATER "103799" ))
+		if(TESTS AND ( "${Boost_VERSION}" VERSION_GREATER "103799" ))
 			foreach(_test ${TESTS})
 				add_test(
 					${_name}-${_test}
--- a/CMakeModules/CopyResourcesToBuildTree.cmake
+++ b/CMakeModules/CopyResourcesToBuildTree.cmake
@@ -30,12 +30,12 @@ function(copy_resources_to_build_tree _target)
 	endif()

 	get_target_property(_path ${_target} LOCATION)
-	get_filename_component(_path "${_path}" DIRECTORY)
+	get_filename_component(_path "${_path}" PATH)

 	if(NOT MSVC AND NOT "${CMAKE_GENERATOR}" MATCHES "Makefiles")
 		foreach(_config ${CMAKE_CONFIGURATION_TYPES})
 			get_target_property(_path${_config} ${_target} LOCATION_${_config})
-			get_filename_component(_path${_config} "${_path${_config}}" DIRECTORY)
+			get_filename_component(_path${_config} "${_path${_config}}" PATH)
 			add_custom_command(TARGET ${_target}
 						POST_BUILD
 						COMMAND
--- a/CMakeModules/ExportDebugSymbols.cmake
+++ b/CMakeModules/ExportDebugSymbols.cmake
@@ -1,26 +0,0 @@
-
-
-# placehodler target for other ones to depend upon
-add_custom_target(
-    debug_symbols
-)
-
-function(export_debug_symbols target)
-
-    if (NOT SIMGEAR_SHARED)
-        return()
-    endif()
-
-    if (APPLE)
-        add_custom_target(${target}.dSYM
-            COMMENT "Generating dSYM files for ${target}"
-            COMMAND dsymutil --out=${target}.dSYM $<TARGET_FILE:${target}>
-            DEPENDS $<TARGET_FILE:${target}>
-        ) 
-
-        install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${target}.dSYM DESTINATION symbols OPTIONAL)
-
-        add_dependencies(debug_symbols ${target}.dSYM)
-    endif()
-
-endfunction()
--- a/568
+++ b/568
--- a/SimGearConfig.cmake.in
+++ b/SimGearConfig.cmake.in
@@ -18,16 +18,6 @@ set(USE_AEONWAVE @USE_AEONWAVE@)

 set(ENABLE_SIMD @ENABLE_SIMD@)

-# OpenRTI support
-set(ENABLE_RTI @ENABLE_RTI@)
-if(ENABLE_RTI)
-  set(RTI_FOUND @RTI_FOUND@)
-  if(RTI_FOUND)
-    set(RTI_INCLUDE_DIRS @RTI_INCLUDE_DIRS@)
-    set(RTI_LDFLAGS @RTI_LDFLAGS@)
-  endif(RTI_FOUND)
-endif(ENABLE_RTI)
-
 # Alternative terrain engine based on pagedLOD

 set(ENABLE_GDAL @ENABLE_GDAL@)
--- a/1
+++ b/1
@@ -1 +0,0 @@
-2020.3.2
--- a/simgear/CMakeLists.txt
+++ b/simgear/CMakeLists.txt
@@ -6,7 +6,6 @@ foreach( mylibfolder
        bvh
        debug
        embedded_resources
-        emesary
        ephemeris
        io
        magvar
@@ -65,9 +64,6 @@ if(SIMGEAR_SHARED)
        set_property(TARGET SimGearScene PROPERTY VERSION   ${SIMGEAR_VERSION})
        set_property(TARGET SimGearScene PROPERTY SOVERSION ${SIMGEAR_SOVERSION})
    endif()
-
-    export_debug_symbols(SimGearCore)
-    export_debug_symbols(SimGearScene)
 else()
    message(STATUS "Library building mode: STATIC LIBRARIES")

@@ -118,22 +114,11 @@ target_include_directories(SimGearCore BEFORE PUBLIC
    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
    $<INSTALL_INTERFACE:include>)

-# so simgear/simgear_config.h is found
-target_include_directories(SimGearCore BEFORE PUBLIC
-    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
-    $<INSTALL_INTERFACE:include>)
-
 target_include_directories(SimGearCore PUBLIC
  ${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
 target_include_directories(SimGearCore PRIVATE
  ${EXPAT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS})

-if (NOT SYSTEM_EXPAT)
-    # XML_STATIC is important to avoid sg_expat_external.h
-    # declaring symbols as declspec(import)
-    target_compile_definitions(SimGearCore PRIVATE HAVE_SIMGEAR_EXPAT_CONFIG_H XML_STATIC)
-endif()
-
    install(TARGETS SimGearCore
            EXPORT SimGearTargets
            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -158,42 +143,40 @@ if (NOT SIMGEAR_HEADLESS)
    endif()
 endif()

-# we expose ZLib in some of our headers
-target_link_libraries(SimGearCore PUBLIC ${ZLIB_LIBRARY})

-target_link_libraries(SimGearCore PRIVATE
+target_link_libraries(SimGearCore
+    ${ZLIB_LIBRARY}
    ${RT_LIBRARY}
    ${DL_LIBRARY}
    ${CMAKE_THREAD_LIBS_INIT}
    ${COCOA_LIBRARY}
    ${CURL_LIBRARIES}
-    ${WINSOCK_LIBRARY}
-    ${SHLWAPI_LIBRARY})
+    ${WINSOCK_LIBRARY})

 if(SYSTEM_EXPAT)
-    target_link_libraries(SimGearCore PRIVATE ${EXPAT_LIBRARIES})
+    target_link_libraries(SimGearCore
+        ${EXPAT_LIBRARIES})
 endif()

 if(ENABLE_DNS AND SYSTEM_UDNS)
-    target_link_libraries(SimGearCore PRIVATE ${UDNS_LIBRARIES})
+    target_link_libraries(SimGearCore
+        ${UDNS_LIBRARIES})
 endif()

 if(NOT SIMGEAR_HEADLESS)
    target_include_directories(SimGearScene PRIVATE ${PROJECT_SOURCE_DIR}/simgear/canvas/ShivaVG/include)

-    target_link_libraries(SimGearScene PUBLIC         
+    target_link_libraries(SimGearScene
        SimGearCore
-        ${OPENSCENEGRAPH_LIBRARIES}
-    )
-
-    target_link_libraries(SimGearScene PRIVATE
        ${ZLIB_LIBRARY}
+        ${OPENSCENEGRAPH_LIBRARIES}
        ${OPENAL_LIBRARY}
        ${OPENGL_LIBRARY}
        ${JPEG_LIBRARY})

    if(ENABLE_GDAL)
-        target_link_libraries(SimGearScene PRIVATE ${GDAL_LIBRARIES})
+        target_link_libraries(SimGearScene
+            ${GDAL_LIBRARIES})
    endif()

    # only actually needed by canvas/KeyboardEvent.cxx
@@ -205,5 +188,5 @@ if(ENABLE_RTI)
    set_property(SOURCE hla/RTI13InteractionClass.cxx hla/RTI13ObjectClass.cxx
        hla/RTI13ObjectInstance.cxx hla/RTI13Federate.cxx
        hla/RTI13FederateFactory.cxx
-        APPEND PROPERTY COMPILE_FLAGS "-I${RTI_INCLUDE_DIRS}")
+        APPEND PROPERTY COMPILE_FLAGS "-I${RTI_INCLUDE_DIR}")
 endif(ENABLE_RTI)
--- a/simgear/bvh/BVHPager.cxx
+++ b/simgear/bvh/BVHPager.cxx
@@ -20,9 +20,9 @@
 #include "BVHPager.hxx"

 #include <list>
-#include <mutex>

 #include <simgear/threads/SGThread.hxx>
+#include <simgear/threads/SGGuard.hxx>

 #include "BVHPageNode.hxx"
 #include "BVHPageRequest.hxx"
@@ -37,12 +37,12 @@ struct BVHPager::_PrivateData : protected SGThread {
    struct _LockedQueue {
        void _push(const _Request& request)
        {
-            std::lock_guard<std::mutex> scopeLock(_mutex);
+            SGGuard<SGMutex> scopeLock(_mutex);
            _requestList.push_back(request);
        }
        _Request _pop()
        {
-            std::lock_guard<std::mutex> scopeLock(_mutex);
+            SGGuard<SGMutex> scopeLock(_mutex);
            if (_requestList.empty())
                return _Request();
            _Request request;
@@ -51,7 +51,7 @@ struct BVHPager::_PrivateData : protected SGThread {
            return request;
        }
    private:
-        std::mutex _mutex;
+        SGMutex _mutex;
        _RequestList _requestList;
    };
    
@@ -62,7 +62,7 @@ struct BVHPager::_PrivateData : protected SGThread {
        }
        void _push(const _Request& request)
        {
-            std::lock_guard<std::mutex> scopeLock(_mutex);
+            SGGuard<SGMutex> scopeLock(_mutex);
            bool needSignal = _requestList.empty();
            _requestList.push_back(request);
            if (needSignal)
@@ -70,7 +70,7 @@ struct BVHPager::_PrivateData : protected SGThread {
        }
        _Request _pop()
        {
-            std::lock_guard<std::mutex> scopeLock(_mutex);
+            SGGuard<SGMutex> scopeLock(_mutex);
            while (_requestList.empty())
                _waitCondition.wait(_mutex);
            _Request request;
@@ -79,7 +79,7 @@ struct BVHPager::_PrivateData : protected SGThread {
            return request;
        }
    private:
-        std::mutex _mutex;
+        SGMutex _mutex;
        SGWaitCondition _waitCondition;
        _RequestList _requestList;
    };
--- a/simgear/canvas/CanvasMgr.hxx
+++ b/simgear/canvas/CanvasMgr.hxx
@@ -28,39 +28,42 @@ namespace simgear
 namespace canvas
 {

-class CanvasMgr : public PropertyBasedMgr
-{
-public:
-    /**
-     * @param node    Root node of branch used to control canvasses
-     */
-    CanvasMgr(SGPropertyNode_ptr node);
+  class CanvasMgr:
+    public PropertyBasedMgr
+  {
+    public:

-    /**
-     * Create a new canvas
-     *
-     * @param name    Name of the new canvas
-     */
-    CanvasPtr createCanvas(const std::string& name = "");
+      /**
+       * @param node    Root node of branch used to control canvasses
+       */
+      CanvasMgr(SGPropertyNode_ptr node);

-    /**
-     * Get ::Canvas by index
-     *
-     * @param index Index of texture node in /canvas/by-index/
-     */
-    CanvasPtr getCanvas(size_t index) const;
+      /**
+       * Create a new canvas
+       *
+       * @param name    Name of the new canvas
+       */
+      CanvasPtr createCanvas(const std::string& name = "");

-    /**
-     * Get ::Canvas by name
-     *
-     * @param name Value of child node "name" in
-     *             /canvas/by-index/texture[i]/name
-     */
-    CanvasPtr getCanvas(const std::string& name) const;
+      /**
+       * Get ::Canvas by index
+       *
+       * @param index Index of texture node in /canvas/by-index/
+       */
+      CanvasPtr getCanvas(size_t index) const;

-protected:
-    void elementCreated(PropertyBasedElementPtr element) override;
-};
+      /**
+       * Get ::Canvas by name
+       *
+       * @param name Value of child node "name" in
+       *             /canvas/by-index/texture[i]/name
+       */
+      CanvasPtr getCanvas(const std::string& name) const;
+
+    protected:
+
+      void elementCreated(PropertyBasedElementPtr element) override;
+  };

 } // namespace canvas
 } // namespace simgear
--- a/simgear/canvas/CanvasWindow.hxx
+++ b/simgear/canvas/CanvasWindow.hxx
@@ -68,8 +68,8 @@ namespace canvas
              Element* parent = 0 );
      virtual ~Window();

-      void update(double delta_time_sec) override;
-      void valueChanged(SGPropertyNode* node) override;
+      virtual void update(double delta_time_sec);
+      virtual void valueChanged(SGPropertyNode* node);

      const SGVec2<float> getPosition() const;
      const SGRect<float>  getScreenRegion() const;
@@ -84,8 +84,8 @@ namespace canvas
      bool isResizable() const;
      bool isCapturingEvents() const;

-      void setVisible(bool visible) override;
-      bool isVisible() const override;
+      virtual void setVisible(bool visible);
+      virtual bool isVisible() const;

      /**
       * Moves window on top of all other windows with the same z-index.
--- a/simgear/canvas/ODGauge.cxx
+++ b/simgear/canvas/ODGauge.cxx
@@ -250,16 +250,10 @@ namespace canvas

    if( !texture )
    {
-      // It shouldn't be necessary to allocate an image for the
-      // texture that is the target of dynamic rendering, but
-      // otherwise OSG won't construct all the mipmaps for the texture
-      // and dynamic mipmap generation doesn't work.
-      osg::Image* image = new osg::Image;
-      image->allocateImage(_size_x, _size_y, 1, GL_RGBA, GL_UNSIGNED_BYTE);
      texture = new osg::Texture2D;
      texture->setResizeNonPowerOfTwoHint(false);
-      texture->setImage(image);
-      texture->setUnRefImageDataAfterApply(true);
+      texture->setTextureSize(_size_x, _size_y);
+      texture->setInternalFormat(GL_RGBA);
    }

    updateSampling();
--- a/simgear/canvas/ShivaVG/src/shConfig.h
+++ b/simgear/canvas/ShivaVG/src/shConfig.h
@@ -31,11 +31,6 @@
    // FreeBSD
    #define VG_API_FREEBSD

-#elif defined(__OpenBSD__)
-
-    // FreeBSD
-    #define VG_API_OPENBSD
-
 #else

    // Unsupported system
--- a/simgear/canvas/ShivaVG/src/shDefs.h
+++ b/simgear/canvas/ShivaVG/src/shDefs.h
@@ -34,7 +34,7 @@
 #include <math.h>
 #include <float.h>

-#if !defined(VG_API_MACOSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+#if !defined(VG_API_MACOSX) && !defined(__FreeBSD__)
 #  include <malloc.h>
 #endif

@@ -161,7 +161,7 @@ SHfloat getMaxFloat();

 /* OpenGL headers */

-#if defined(VG_API_LINUX) || defined(VG_API_FREEBSD) || defined(VG_API_OPENBSD)
+#if defined(VG_API_LINUX) || defined(VG_API_FREEBSD)
    #include <GL/gl.h>
    #include <GL/glx.h>
 #elif defined(VG_API_MACOSX)
--- a/simgear/canvas/ShivaVG/src/shPath.c
+++ b/simgear/canvas/ShivaVG/src/shPath.c
@@ -1193,7 +1193,7 @@ VG_API_CALL VGboolean vgInterpolatePath(VGPath dstPath, VGPath startPath,
  SHfloat *procData1, *procData2;
  SHint procSegCount1=0, procSegCount2=0;
  SHint procDataCount1=0, procDataCount2=0;
-  SHuint8 *newSegs, *newData=0;
+  SHuint8 *newSegs, *newData;
  void *userData[4];
  SHint segment1, segment2;
  SHint segindex, s,d,i;
--- a/simgear/canvas/canvas_fwd.hxx
+++ b/simgear/canvas/canvas_fwd.hxx
@@ -26,9 +26,11 @@
 #include <osg/ref_ptr>
 #include <osgText/Font>

-#include <functional>
+#include <boost/function.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
+
 #include <map>
-#include <memory>
 #include <vector>

 namespace simgear
@@ -60,8 +62,8 @@ namespace canvas

 #define SG_FWD_DECL(name)\
  class name;\
-  typedef std::shared_ptr<name> name##Ptr;\
-  typedef std::weak_ptr<name> name##WeakPtr;
+  typedef boost::shared_ptr<name> name##Ptr;\
+  typedef boost::weak_ptr<name> name##WeakPtr;

  SG_FWD_DECL(Placement)
  SG_FWD_DECL(SystemAdapter)
@@ -83,10 +85,10 @@ namespace canvas
  typedef osg::ref_ptr<osgText::Font> FontPtr;

  typedef std::vector<PlacementPtr> Placements;
-  typedef std::function<Placements( SGPropertyNode*,
-                                    CanvasPtr )> PlacementFactory;
+  typedef boost::function<Placements( SGPropertyNode*,
+                                      CanvasPtr )> PlacementFactory;

-  typedef std::function<void(const EventPtr&)> EventListener;
+  typedef boost::function<void(const EventPtr&)> EventListener;

 } // namespace canvas
 } // namespace simgear
--- a/simgear/canvas/elements/CanvasElement.hxx
+++ b/simgear/canvas/elements/CanvasElement.hxx
@@ -29,6 +29,9 @@
 #include <osg/BoundingBox>
 #include <osg/MatrixTransform>

+#include <boost/bind.hpp>
+#include <boost/function.hpp>
+
 namespace osg
 {
  class Drawable;
@@ -59,9 +62,9 @@ namespace canvas
          OSGUserData(ElementPtr element);
      };

-      typedef std::function<bool(Element&, const SGPropertyNode*)>
+      typedef boost::function<bool(Element&, const SGPropertyNode*)>
              StyleSetterFunc;
-      typedef std::function<void(Element&, const SGPropertyNode*)>
+      typedef boost::function<void(Element&, const SGPropertyNode*)>
              StyleSetterFuncUnchecked;
      struct StyleSetter:
        public SGReferenced
@@ -316,7 +319,7 @@ namespace canvas
      StyleSetter
      addStyle( const std::string& name,
                const std::string& type,
-                const std::function<void (Derived&, T2)>& setter,
+                const boost::function<void (Derived&, T2)>& setter,
                bool inheritable = true )
      {
        StyleInfo& style_info = _style_setters[ name ];
@@ -342,10 +345,13 @@ namespace canvas
        if( style->func )
          style = style->next = new StyleSetter;

-        style->func = std::bind(&type_match<Derived>::call,
-                                std::placeholders::_1,
-                                std::placeholders::_2,
-                                bindStyleSetter<T1>(name, setter));
+        style->func = boost::bind
+        (
+          &type_match<Derived>::call,
+          _1,
+          _2,
+          bindStyleSetter<T1>(name, setter)
+        );
        return *style;
      }

@@ -357,7 +363,7 @@ namespace canvas
      StyleSetter
      addStyle( const std::string& name,
                const std::string& type,
-                const std::function<void (Derived&, T)>& setter,
+                const boost::function<void (Derived&, T)>& setter,
                bool inheritable = true )
      {
        return addStyle<T, T>(name, type, setter, inheritable);
@@ -378,7 +384,7 @@ namespace canvas
        (
          name,
          type,
-          std::function<void (Derived&, T)>(setter),
+          boost::function<void (Derived&, T)>(setter),
          inheritable
        );
      }
@@ -399,7 +405,7 @@ namespace canvas
        (
          name,
          type,
-          std::function<void (Derived&, T2)>(setter),
+          boost::function<void (Derived&, T2)>(setter),
          inheritable
        );
      }
@@ -418,7 +424,7 @@ namespace canvas
        (
          name,
          type,
-          std::function<void (Derived&, const std::string&)>(setter),
+          boost::function<void (Derived&, const std::string&)>(setter),
          inheritable
        );
      }
@@ -481,7 +487,7 @@ namespace canvas
      StyleSetter
      addStyle( const std::string& name,
                const std::string& type,
-                const std::function<void (Other&, T2)>& setter,
+                const boost::function<void (Other&, T2)>& setter,
                OtherRef Derived::*instance_ref,
                bool inheritable = true )
      {
@@ -511,7 +517,7 @@ namespace canvas
        (
          name,
          type,
-          std::function<void (Other&, const std::string&)>(setter),
+          boost::function<void (Other&, const std::string&)>(setter),
          instance_ref,
          inheritable
        );
@@ -519,37 +525,44 @@ namespace canvas

      template<typename T, class Derived, class Other, class OtherRef>
      static
-      std::function<void (Derived&, T)>
+      boost::function<void (Derived&, T)>
      bindOther( void (Other::*setter)(T), OtherRef Derived::*instance_ref )
      {
-        return std::bind(setter,
-                         std::bind(instance_ref, std::placeholders::_1),
-                         std::placeholders::_2);
+        return boost::bind(setter, boost::bind(instance_ref, _1), _2);
      }

      template<typename T, class Derived, class Other, class OtherRef>
      static
-      std::function<void (Derived&, T)>
-      bindOther( const std::function<void (Other&, T)>& setter,
+      boost::function<void (Derived&, T)>
+      bindOther( const boost::function<void (Other&, T)>& setter,
                 OtherRef Derived::*instance_ref )
      {
-        return std::bind(setter,
-                         std::bind(&reference_from_pointer<Other, OtherRef>,
-                                   std::bind(instance_ref, std::placeholders::_1)),
-                         std::placeholders::_2);
+        return boost::bind
+        (
+          setter,
+          boost::bind
+          (
+            &reference_from_pointer<Other, OtherRef>,
+            boost::bind(instance_ref, _1)
+          ),
+          _2
+        );
      }

      template<typename T1, typename T2, class Derived>
      static
      StyleSetterFuncUnchecked
      bindStyleSetter( const std::string& name,
-                       const std::function<void (Derived&, T2)>& setter )
+                       const boost::function<void (Derived&, T2)>& setter )
      {
-        return std::bind(setter,
-                         // We will only call setters with Derived instances, so we can safely
-                         // cast here.
-                         std::bind(&derived_cast<Derived>, std::placeholders::_1),
-                         std::bind(&getValue<T1>, std::placeholders::_2));
+        return boost::bind
+        (
+          setter,
+          // We will only call setters with Derived instances, so we can safely
+          // cast here.
+          boost::bind(&derived_cast<Derived>, _1),
+          boost::bind(&getValue<T1>, _2)
+        );
      }

      bool isStyleEmpty(const SGPropertyNode* child) const;
--- a/simgear/canvas/elements/CanvasImage.cxx
+++ b/simgear/canvas/elements/CanvasImage.cxx
@@ -838,143 +838,5 @@ namespace canvas
    return false;
  }

-  void Image::fillRect(const SGRect<int>& rect, const std::string& c)
-  {
-    osg::Vec4 color(1,1,1,1);
-    if(!c.empty() && !parseColor(c, color))
-      return;
-    
-    fillRect(rect, color);
-  }
-
-void fillRow(GLubyte* row, GLuint pixel, GLuint width, GLuint pixelBytes)
-{
-  GLubyte* dst = row;
-  for (GLuint x = 0; x < width; ++x) {
-    memcpy(dst, &pixel, pixelBytes);
-    dst += pixelBytes;
-  }
-}
-
-SGRect<int> intersectRect(const SGRect<int>& a, const SGRect<int>& b)
-{
-  SGVec2<int> m1 = max(a.getMin(), b.getMin());
-  SGVec2<int> m2 = min(a.getMax(), b.getMax());
-  return SGRect<int>(m1, m2);
-}
-
-  void Image::fillRect(const SGRect<int>& rect, const osg::Vec4& color)
-  {
-    osg::ref_ptr<osg::Image> image = _texture->getImage();
-    if (!image) {
-      allocateImage();
-      image = _texture->getImage();
-    }
-      
-      if (image->getDataVariance() != osg::Object::DYNAMIC) {
-          image->setDataVariance(osg::Object::DYNAMIC);
-      }
-      
-    const auto format = image->getInternalTextureFormat();
-    
-    auto clippedRect = intersectRect(rect, SGRect<int>(0, 0, image->s(), image->t()));
-    if ((clippedRect.width() == 0) || (clippedRect.height() == 0)) {
-      return;
-    }
-    
-    GLubyte* rowData = nullptr;
-    size_t rowByteSize = 0;
-    GLuint pixelWidth = clippedRect.width();
-    GLuint pixel = 0;
-    GLuint pixelBytes = 0;
-    
-    switch (format) {
-    case GL_RGBA8:
-    case GL_RGBA:
-        rowByteSize = pixelWidth * 4;
-        rowData = static_cast<GLubyte*>(alloca(rowByteSize));
-        
-        // assume litte-endian, so read out backwards, hence when we memcpy
-        // the data, it ends up in RGBA order
-        pixel = color.asABGR();
-        pixelBytes = 4;
-        fillRow(rowData, pixel, pixelWidth, pixelBytes);
-        break;
-    
-    case GL_RGB8:
-    case GL_RGB:
-        rowByteSize = pixelWidth * 3;
-        rowData = static_cast<GLubyte*>(alloca(rowByteSize));
-        pixel = color.asABGR();
-        pixelBytes = 3;
-        fillRow(rowData, pixel, pixelWidth, pixelBytes);
-        break;
-        
-    default:
-      SG_LOG(SG_IO, SG_WARN, "Image::fillRect: unsupported internal image format:" << format);
-      return;
-    }
-    
-    for (int row=clippedRect.t(); row < clippedRect.b(); ++row) {
-      GLubyte* imageData = image->data(clippedRect.l(), row);
-      memcpy(imageData, rowData, rowByteSize);
-    }
-      
-    image->dirty();
-    auto c = getCanvas().lock();
-    c->enableRendering(true); // force a repaint
-  }
-
-  void Image::setPixel(int x, int y, const std::string& c)
-  {
-    osg::Vec4 color(1,1,1,1);
-    if(!c.empty() && !parseColor(c, color))
-      return;
-    
-    setPixel(x, y, color);
-  }
-
-  void Image::setPixel(int x, int y, const osg::Vec4& color)
-  {
-    osg::ref_ptr<osg::Image> image = _texture->getImage();
-    if (!image) {
-        allocateImage();
-        image = _texture->getImage();
-    }
-     
-    if (image->getDataVariance() != osg::Object::DYNAMIC) {
-      image->setDataVariance(osg::Object::DYNAMIC);
-    }
-      
-    image->setColor(color, x, y);
-  }
-
-    void Image::dirtyPixels()
-    {
-        osg::ref_ptr<osg::Image> image = _texture->getImage();
-        if (!image)
-            return;
-        image->dirty();
-        auto c = getCanvas().lock();
-        c->enableRendering(true); // force a repaint
-    }
-
-  void Image::allocateImage()
-  {
-    osg::Image* image = new osg::Image;
-    // default to RGBA
-    image->allocateImage(_node->getIntValue("size[0]"), _node->getIntValue("size[1]"), 1, GL_RGBA, GL_UNSIGNED_BYTE);
-    image->setInternalTextureFormat(GL_RGBA);
-    _texture->setImage(image);
-  }
-
-
-osg::ref_ptr<osg::Image> Image::getImage() const
-{
-    if (!_texture)
-        return {};
-    return _texture->getImage();
-}
-
 } // namespace canvas
 } // namespace simgear
--- a/simgear/canvas/elements/CanvasImage.hxx
+++ b/simgear/canvas/elements/CanvasImage.hxx
@@ -101,28 +101,6 @@ namespace canvas
       */
      void setSourceRect(const SGRect<float>& sourceRect);

-      /**
-       * fill the specified rectangle of the image, with an RGB value
-       */
-      void fillRect(const SGRect<int>& rect, const std::string& color);
-      
-      /**
-       * fill the specified rectangle of the image, with an RGB value
-       */
-      void fillRect(const SGRect<int>& rect, const osg::Vec4& color);
-      
-      void setPixel(int x, int y, const std::string& color);
-      
-      void setPixel(int x, int y, const osg::Vec4& color);
-
-      /**
-        * mark the image pixels as modified, so the canvas is re-painted
-       */
-      void dirtyPixels();
-      
-      osg::ref_ptr<osg::Image> getImage() const;
-      
-    //  void setRow(int row, int offset, )
    protected:
      enum ImageAttributes
      {
@@ -147,8 +125,6 @@ namespace canvas
                      HTTP::Request& request,
                      const std::string& type );

-      void allocateImage();
-      
      osg::ref_ptr<osg::Texture2D> _texture;
      // TODO optionally forward events to canvas
      CanvasWeakPtr _src_canvas;
--- a/simgear/canvas/elements/CanvasText.cxx
+++ b/simgear/canvas/elements/CanvasText.cxx
@@ -53,31 +53,26 @@ namespace canvas
      TextLine lineAt(size_t i) const;

      /// Get nearest line to given y-coordinate
-#if OSG_VERSION_LESS_THAN(3,6,5)
      TextLine nearestLine(float pos_y) const;
-      SGVec2i sizeForWidth(int w) const;
-#else
-      TextLine nearestLine(float pos_y);
-      SGVec2i sizeForWidth(int w);
-#endif

+
+      SGVec2i sizeForWidth(int w) const;
+
+      osg::BoundingBox
 #if OSG_VERSION_LESS_THAN(3,3,2)
-      osg::BoundingBox computeBound() const override;
+      computeBound()
 #else
-      osg::BoundingBox computeBoundingBox() const override;
+      computeBoundingBox()
 #endif
+      const override;

    protected:
      friend class TextLine;

      canvas::Text *_text_element;

-#if OSG_VERSION_LESS_THAN(3,5,6)
-     void computePositions(unsigned int contextID) const override;
-#else
-     void computePositionsImplementation() override;
-#endif
-};
+      void computePositions(unsigned int contextID) const override;
+  };

  class TextLine
  {
@@ -127,7 +122,6 @@ namespace canvas

    _quads = &text->_textureGlyphQuadMap.begin()->second;

-#if OSG_VERSION_LESS_THAN(3,5,6)
    GlyphQuads::LineNumbers const& line_numbers = _quads->_lineNumbers;
    GlyphQuads::LineNumbers::const_iterator begin_it =
      std::lower_bound(line_numbers.begin(), line_numbers.end(), _line);
@@ -139,9 +133,6 @@ namespace canvas
    _begin = begin_it - line_numbers.begin();
    _end = std::upper_bound(begin_it, line_numbers.end(), _line)
         - line_numbers.begin();
-#else
-  // TODO: Need 3.5.6 version of this
-#endif
  }

  //----------------------------------------------------------------------------
@@ -170,40 +161,34 @@ namespace canvas

    if( empty() )
      return pos;
-
-#if OSG_VERSION_GREATER_OR_EQUAL(3,5,6)
-    // TODO: need 3.5.6 version of this.
-#else
 #if OSG_VERSION_LESS_THAN(3,3,5)
-      GlyphQuads::Coords2 const& coords = _quads->_coords;
+    GlyphQuads::Coords2 const& coords = _quads->_coords;
 #else
-      GlyphQuads::Coords2 refCoords = _quads->_coords;
-      GlyphQuads::Coords2::element_type &coords = *refCoords.get();
+    GlyphQuads::Coords2 refCoords = _quads->_coords;
+    GlyphQuads::Coords2::element_type &coords = *refCoords.get();
 #endif
+    size_t global_i = _begin + i;

-      size_t global_i = _begin + i;
+    if( global_i == _begin )
+      // before first character of line
+      pos.x() = coords[_begin * 4].x();
+    else if( global_i == _end )
+      // After Last character of line
+      pos.x() = coords[(_end - 1) * 4 + 2].x();
+    else
+    {
+      float prev_l = coords[(global_i - 1) * 4].x(),
+            prev_r = coords[(global_i - 1) * 4 + 2].x(),
+            cur_l = coords[global_i * 4].x();

-      if (global_i == _begin)
-          // before first character of line
-          pos.x() = coords[_begin * 4].x();
-      else if (global_i == _end)
-          // After Last character of line
-          pos.x() = coords[(_end - 1) * 4 + 2].x();
+      if( prev_l == prev_r )
+        // If previous character width is zero set to begin of next character
+        // (Happens eg. with spaces)
+        pos.x() = cur_l;
      else
-      {
-          float prev_l = coords[(global_i - 1) * 4].x(),
-              prev_r = coords[(global_i - 1) * 4 + 2].x(),
-              cur_l = coords[global_i * 4].x();
-
-          if (prev_l == prev_r)
-              // If previous character width is zero set to begin of next character
-              // (Happens eg. with spaces)
-              pos.x() = cur_l;
-          else
-              // position at center between characters
-              pos.x() = 0.5 * (prev_r + cur_l);
-      }
-#endif
+        // position at center between characters
+        pos.x() = 0.5 * (prev_r + cur_l);
+    }

    return pos;
  }
@@ -211,22 +196,17 @@ namespace canvas
  //----------------------------------------------------------------------------
  osg::Vec2 TextLine::nearestCursor(float x) const
  {
-    if (empty())
+    if( empty() )
      return cursorPos(0);

-#if OSG_VERSION_GREATER_OR_EQUAL(3,5,6)
-  // TODO: need 3.5.7 version of this.
-	return cursorPos(0);
-#else
-#if OSG_VERSION_LESS_THAN(3,3,5)
+    GlyphQuads::Glyphs const& glyphs = _quads->_glyphs;
+    #if OSG_VERSION_LESS_THAN(3,3,5)
    GlyphQuads::Coords2 const& coords = _quads->_coords;
 #else
    GlyphQuads::Coords2 refCoords = _quads->_coords;
    GlyphQuads::Coords2::element_type &coords = *refCoords.get();
 #endif

-    GlyphQuads::Glyphs const& glyphs = _quads->_glyphs;
-
    float const HIT_FRACTION = 0.6;
    float const character_width = _text->getCharacterHeight()
                                * _text->getCharacterAspectRatio();
@@ -245,7 +225,6 @@ namespace canvas
    }

    return cursorPos(i - _begin);
-#endif
  }

  //----------------------------------------------------------------------------
@@ -324,16 +303,9 @@ namespace canvas
  }

  //----------------------------------------------------------------------------
-#if OSG_VERSION_LESS_THAN(3,6,5)
  TextLine Text::TextOSG::nearestLine(float pos_y) const
  {
    osgText::Font const* font = getActiveFont();
-#else
-  TextLine Text::TextOSG::nearestLine(float pos_y)
-  {
-    auto font = getActiveFont();
-#endif
-
    if( !font || lineCount() <= 0 )
      return TextLine(0, this);

@@ -355,21 +327,12 @@ namespace canvas
  // simplified version of osgText::Text::computeGlyphRepresentation() to
  // just calculate the size for a given weight. Glpyh calculations/creating
  // is not necessary for this...
-#if OSG_VERSION_LESS_THAN(3,6,5)
  SGVec2i Text::TextOSG::sizeForWidth(int w) const
-#else
-  SGVec2i Text::TextOSG::sizeForWidth(int w)
-#endif
  {
    if( _text.empty() )
      return SGVec2i(0, 0);

-#if OSG_VERSION_LESS_THAN(3,6,5)
    osgText::Font* activefont = const_cast<osgText::Font*>(getActiveFont());
-#else
-    auto activefont = getActiveFont();
-#endif
-
    if( !activefont )
      return SGVec2i(-1, -1);

@@ -649,16 +612,19 @@ namespace canvas
  }

  //----------------------------------------------------------------------------
+  osg::BoundingBox
 #if OSG_VERSION_LESS_THAN(3,3,2)
-  osg::BoundingBox Text::TextOSG::computeBound() const
+  Text::TextOSG::computeBound()
 #else
-  osg::BoundingBox Text::TextOSG::computeBoundingBox() const
+  Text::TextOSG::computeBoundingBox()
 #endif
+  const
  {
+    osg::BoundingBox bb =
 #if OSG_VERSION_LESS_THAN(3,3,2)
-      osg::BoundingBox bb = osgText::Text::computeBound();
+      osgText::Text::computeBound();
 #else
-      osg::BoundingBox bb = osgText::Text::computeBoundingBox();
+      osgText::Text::computeBoundingBox();
 #endif

 #if OSG_VERSION_LESS_THAN(3,1,0)
@@ -674,7 +640,7 @@ namespace canvas
    return bb;
  }

-#if OSG_VERSION_LESS_THAN(3,5,6)
+  //----------------------------------------------------------------------------
  void Text::TextOSG::computePositions(unsigned int contextID) const
  {
    if( _textureGlyphQuadMap.empty() || _layout == VERTICAL )
@@ -744,14 +710,6 @@ namespace canvas
    return osgText::Text::computePositions(contextID);
  }

-#else
-  void Text::TextOSG::computePositionsImplementation()
-  {
-    TextBase::computePositionsImplementation();
-  }
-#endif
- //----------------------------------------------------------------------------
-
  //----------------------------------------------------------------------------
  const std::string Text::TYPE_NAME = "text";

--- a/simgear/canvas/layout/BoxLayout.cxx
+++ b/simgear/canvas/layout/BoxLayout.cxx
@@ -73,7 +73,7 @@ namespace canvas
                              int stretch,
                              uint8_t alignment )
  {
-    ItemData item_data = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    ItemData item_data = {0};
    item_data.layout_item = item;
    item_data.stretch = std::max(0, stretch);

--- a/simgear/canvas/layout/Layout.cxx
+++ b/simgear/canvas/layout/Layout.cxx
@@ -18,9 +18,6 @@

 #include <simgear_config.h>
 #include "Layout.hxx"
-
-#include <algorithm>
-
 #include <simgear/debug/logstream.hxx>

 namespace simgear
--- a/simgear/canvas/layout/NasalWidget.cxx
+++ b/simgear/canvas/layout/NasalWidget.cxx
@@ -150,7 +150,7 @@ namespace canvas
  //----------------------------------------------------------------------------
  bool NasalWidget::hasHeightForWidth() const
  {
-    return _height_for_width || _min_height_for_width;
+    return !_height_for_width.empty() || !_min_height_for_width.empty();
  }

  //----------------------------------------------------------------------------
@@ -186,7 +186,7 @@ namespace canvas
  int NasalWidget::callHeightForWidthFunc( const HeightForWidthFunc& hfw,
                                           int w ) const
  {
-    if( !hfw )
+    if( hfw.empty() )
      return -1;

    try
@@ -239,17 +239,17 @@ namespace canvas
  //----------------------------------------------------------------------------
  int NasalWidget::heightForWidthImpl(int w) const
  {
-    return callHeightForWidthFunc( _height_for_width
-                                 ? _height_for_width
-                                 : _min_height_for_width, w );
+    return callHeightForWidthFunc( _height_for_width.empty()
+                                 ? _min_height_for_width
+                                 : _height_for_width, w );
  }

  //----------------------------------------------------------------------------
  int NasalWidget::minimumHeightForWidthImpl(int w) const
  {
-    return callHeightForWidthFunc( _min_height_for_width
-                                 ? _min_height_for_width
-                                 : _height_for_width, w );
+    return callHeightForWidthFunc( _min_height_for_width.empty()
+                                 ? _height_for_width
+                                 : _min_height_for_width, w );
  }


--- a/simgear/canvas/layout/NasalWidget.hxx
+++ b/simgear/canvas/layout/NasalWidget.hxx
@@ -40,8 +40,8 @@ namespace canvas
  {
    public:

-      typedef std::function<void (nasal::Me, const SGRecti&)> SetGeometryFunc;
-      typedef std::function<int (nasal::Me, int)> HeightForWidthFunc;
+      typedef boost::function<void (nasal::Me, const SGRecti&)> SetGeometryFunc;
+      typedef boost::function<int (nasal::Me, int)> HeightForWidthFunc;

      /**
       *
--- a/simgear/debug/BufferedLogCallback.cxx
+++ b/simgear/debug/BufferedLogCallback.cxx
@@ -18,29 +18,30 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
-
+ 
 #include <simgear_config.h>
 #include <simgear/debug/BufferedLogCallback.hxx>
-
+     
+#include <boost/foreach.hpp>
+     
 #include <simgear/sg_inlines.h>
 #include <simgear/threads/SGThread.hxx>
+#include <simgear/threads/SGGuard.hxx>

 #include <cstdlib> // for malloc
-#include <cstring>
-#include <mutex>
-
+     
 namespace simgear
 {

 class BufferedLogCallback::BufferedLogCallbackPrivate
 {
 public:
-    std::mutex m_mutex;
+    SGMutex m_mutex;
    vector_cstring m_buffer;
    unsigned int m_stamp;
    unsigned int m_maxLength;
 };
-
+   
 BufferedLogCallback::BufferedLogCallback(sgDebugClass c, sgDebugPriority p) :
 	simgear::LogCallback(c,p),
    d(new BufferedLogCallbackPrivate)
@@ -51,19 +52,19 @@ BufferedLogCallback::BufferedLogCallback(sgDebugClass c, sgDebugPriority p) :

 BufferedLogCallback::~BufferedLogCallback()
 {
-    for (auto msg : d->m_buffer) {
+    BOOST_FOREACH(unsigned char* msg, d->m_buffer) {
        free(msg);
    }
 }
-
-void BufferedLogCallback::operator()(sgDebugClass c, sgDebugPriority p,
+ 
+void BufferedLogCallback::operator()(sgDebugClass c, sgDebugPriority p, 
        const char* file, int line, const std::string& aMessage)
 {
    SG_UNUSED(file);
    SG_UNUSED(line);
-
+    
    if (!shouldLog(c, p)) return;
-
+    
    vector_cstring::value_type msg;
    if (aMessage.size() >= d->m_maxLength) {
        msg = (vector_cstring::value_type) malloc(d->m_maxLength);
@@ -72,29 +73,29 @@ void BufferedLogCallback::operator()(sgDebugClass c, sgDebugPriority p,
    } else {
        msg = (vector_cstring::value_type) strdup(aMessage.c_str());
    }
-
-    std::lock_guard<std::mutex> g(d->m_mutex);
+    
+    SGGuard<SGMutex> g(d->m_mutex);
    d->m_buffer.push_back(msg);
    d->m_stamp++;
 }
-
+ 
 unsigned int BufferedLogCallback::stamp() const
 {
    return d->m_stamp;
 }
-
+ 
 unsigned int BufferedLogCallback::threadsafeCopy(vector_cstring& aOutput)
 {
-    std::lock_guard<std::mutex> g(d->m_mutex);
+    SGGuard<SGMutex> g(d->m_mutex);
    size_t sz = d->m_buffer.size();
    aOutput.resize(sz);
    memcpy(aOutput.data(), d->m_buffer.data(), sz * sizeof(vector_cstring::value_type));
    return d->m_stamp;
-}
-
+} 
+ 
 void BufferedLogCallback::truncateAt(unsigned int t)
 {
    d->m_maxLength = t;
 }
-
+ 
 } // of namespace simgear
--- a/simgear/debug/BufferedLogCallback.hxx
+++ b/simgear/debug/BufferedLogCallback.hxx
@@ -26,7 +26,7 @@
 #include <vector>
 #include <memory> // for std::unique_ptr

-#include <simgear/debug/LogCallback.hxx>
+#include <simgear/debug/logstream.hxx>

 namespace simgear
 {
--- a/simgear/debug/CMakeLists.txt
+++ b/simgear/debug/CMakeLists.txt
@@ -1,10 +1,7 @@

 include (SimGearComponent)

-set(HEADERS debug_types.h 
-    logstream.hxx BufferedLogCallback.hxx OsgIoCapture.hxx
-    LogCallback.hxx LogEntry.hxx)
-set(SOURCES logstream.cxx BufferedLogCallback.cxx
-    LogCallback.cxx LogEntry.cxx)
+set(HEADERS debug_types.h logstream.hxx BufferedLogCallback.hxx OsgIoCapture.hxx)
+set(SOURCES logstream.cxx BufferedLogCallback.cxx)

 simgear_component(debug debug "${SOURCES}" "${HEADERS}")
--- a/simgear/debug/LogCallback.cxx
+++ b/simgear/debug/LogCallback.cxx
@@ -1,116 +0,0 @@
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library 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
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
-
-#include <simgear_config.h>
-
-#include "LogCallback.hxx"
-
-using namespace simgear;
-
-LogCallback::LogCallback(sgDebugClass c, sgDebugPriority p) : m_class(c),
-                                                              m_priority(p)
-{
-}
-
-void LogCallback::operator()(sgDebugClass c, sgDebugPriority p,
-                             const char* file, int line, const std::string& aMessage)
-{
-    // override me
-}
-
-bool LogCallback::doProcessEntry(const LogEntry& e)
-{
-    return false;
-}
-
-void LogCallback::processEntry(const LogEntry& e)
-{
-    if (doProcessEntry(e))
-        return; // derived class used the new API
-
-    // call the old API
-    (*this)(e.debugClass, e.debugPriority, e.file, e.line, e.message);
-}
-
-
-bool LogCallback::shouldLog(sgDebugClass c, sgDebugPriority p) const
-{
-    if ((c & m_class) != 0 && p >= m_priority)
-        return true;
-    if (c == SG_OSG) // always have OSG logging as it OSG logging is configured separately.
-        return true;
-    return false;
-}
-
-void LogCallback::setLogLevels(sgDebugClass c, sgDebugPriority p)
-{
-    m_priority = p;
-    m_class = c;
-}
-const char* LogCallback::debugPriorityToString(sgDebugPriority p)
-{
-    switch (p) {
-    case SG_DEV_ALERT:
-    case SG_ALERT:
-        return "ALRT";
-    case SG_BULK: return "BULK";
-    case SG_DEBUG: return "DBUG";
-    case SG_MANDATORY_INFO:
-    case SG_INFO:
-        return "INFO";
-    case SG_POPUP: return "POPU";
-    case SG_DEV_WARN:
-    case SG_WARN:
-        return "WARN";
-
-    default: return "UNKN";
-    }
-}
-
-const char* LogCallback::debugClassToString(sgDebugClass c)
-{
-    switch (c) {
-    case SG_NONE: return "none";
-    case SG_TERRAIN: return "terrain";
-    case SG_ASTRO: return "astro";
-    case SG_FLIGHT: return "flight";
-    case SG_INPUT: return "input";
-    case SG_GL: return "opengl";
-    case SG_VIEW: return "view";
-    case SG_COCKPIT: return "cockpit";
-    case SG_GENERAL: return "general";
-    case SG_MATH: return "math";
-    case SG_EVENT: return "event";
-    case SG_AIRCRAFT: return "aircraft";
-    case SG_AUTOPILOT: return "autopilot";
-    case SG_IO: return "io";
-    case SG_CLIPPER: return "clipper";
-    case SG_NETWORK: return "network";
-    case SG_ATC: return "atc";
-    case SG_NASAL: return "nasal";
-    case SG_INSTR: return "instruments";
-    case SG_SYSTEMS: return "systems";
-    case SG_AI: return "ai";
-    case SG_ENVIRONMENT: return "environment";
-    case SG_SOUND: return "sound";
-    case SG_NAVAID: return "navaid";
-    case SG_GUI: return "gui";
-    case SG_TERRASYNC: return "terrasync";
-    case SG_PARTICLES: return "particles";
-    case SG_HEADLESS: return "headless";
-    case SG_OSG: return "OSG";
-    default: return "unknown";
-    }
-}
--- a/simgear/debug/LogCallback.hxx
+++ b/simgear/debug/LogCallback.hxx
@@ -1,56 +0,0 @@
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library 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
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
-
-#pragma once
-
-#include <string>
-
-#include "LogEntry.hxx"
-#include "debug_types.h"
-
-namespace simgear {
-
-class LogCallback
-{
-public:
-    virtual ~LogCallback() = default;
-
-    // newer API: return true if you handled the message, otherwise
-    // the old API will be called
-    virtual bool doProcessEntry(const LogEntry& e);
-
-    // old API, kept for compatability
-    virtual void operator()(sgDebugClass c, sgDebugPriority p,
-                            const char* file, int line, const std::string& aMessage);
-
-    void setLogLevels(sgDebugClass c, sgDebugPriority p);
-
-    void processEntry(const LogEntry& e);
-
-protected:
-    LogCallback(sgDebugClass c, sgDebugPriority p);
-
-    bool shouldLog(sgDebugClass c, sgDebugPriority p) const;
-
-    static const char* debugClassToString(sgDebugClass c);
-    static const char* debugPriorityToString(sgDebugPriority p);
-
-private:
-    sgDebugClass m_class;
-    sgDebugPriority m_priority;
-};
-
-
-} // namespace simgear
--- a/simgear/debug/LogEntry.cxx
+++ b/simgear/debug/LogEntry.cxx
@@ -1,45 +0,0 @@
-
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library 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
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
-
-#include <simgear_config.h>
-
-#include "LogEntry.hxx"
-
-#include <cstring> // for strdup
-
-namespace simgear {
-
-LogEntry::~LogEntry()
-{
-    if (freeFilename) {
-        free(const_cast<char*>(file));
-    }
-}
-
-LogEntry::LogEntry(const LogEntry& c) : debugClass(c.debugClass),
-                                        debugPriority(c.debugPriority),
-                                        originalPriority(c.originalPriority),
-                                        file(c.file),
-                                        line(c.line),
-                                        message(c.message),
-                                        freeFilename(c.freeFilename)
-{
-    if (c.freeFilename) {
-        file = strdup(c.file);
-    }
-}
-
-} // namespace simgear
--- a/simgear/debug/LogEntry.hxx
+++ b/simgear/debug/LogEntry.hxx
@@ -1,54 +0,0 @@
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library 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
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
-
-#pragma once
-
-#include <string>
-
-#include "debug_types.h"
-
-namespace simgear {
-/**
- * storage of a single log entry. This is used to pass log entries from
- * the various threads to the logging thread, and also to store the startup
- * entries
- */
-class LogEntry
-{
-public:
-    LogEntry(sgDebugClass c, sgDebugPriority p,
-             sgDebugPriority op,
-             const char* f, int l, const std::string& msg) : debugClass(c), debugPriority(p), originalPriority(op),
-                                                             file(f), line(l),
-                                                             message(msg)
-    {
-    }
-
-    LogEntry(const LogEntry& c);
-    LogEntry& operator=(const LogEntry& c) = delete;
-
-    ~LogEntry();
-
-    const sgDebugClass debugClass;
-    const sgDebugPriority debugPriority;
-    const sgDebugPriority originalPriority;
-    const char* file;
-    const int line;
-    const std::string message;
-
-    bool freeFilename = false; ///< if true, we own, and therefore need to free, the memory pointed to by 'file'
-};
-
-} // namespace simgear
--- a/simgear/debug/OsgIoCapture.hxx
+++ b/simgear/debug/OsgIoCapture.hxx
@@ -2,13 +2,14 @@

 #include <osg/Notify>

-#include <simgear/debug/logstream.hxx>
+using namespace osg;
+

 /**
-* merge OSG output into our logging system, so it gets recorded to file,
-* and so we can display a GUI console with renderer issues, especially
-* shader compilation warnings and errors.
-*/
+ * merge OSG output into our logging system, so it gets recorded to file,
+ * and so we can display a GUI console with renderer issues, especially
+ * shader compilation warnings and errors.
+ */
 class NotifyLogger : public osg::NotifyHandler
 {
 public:
@@ -21,33 +22,24 @@ public:
        if (strstr(message, "the final reference count was")) {
            // as this is going to segfault ignore the translation of severity and always output the message.
            SG_LOG(SG_GL, SG_ALERT, message);
-#ifndef DEBUG
-            throw new std::string(message);
-            //int* trigger_segfault = 0;
-            //*trigger_segfault     = 0;
-#endif
+            int* trigger_segfault = 0;
+            *trigger_segfault     = 0;
            return;
        }
-        char*tmessage = strdup(message);
-        char*lf = strrchr(tmessage, '\n');
-        if (lf)
-            *lf = 0;
-
-        SG_LOG(SG_OSG, translateSeverity(severity), tmessage);
-        free(tmessage);
+        SG_LOG(SG_GL, translateSeverity(severity), message);
    }

 private:
    sgDebugPriority translateSeverity(osg::NotifySeverity severity) {
        switch (severity) {
-        case osg::ALWAYS:
-        case osg::FATAL:      return SG_ALERT;
-        case osg::WARN:       return SG_WARN;
-        case osg::NOTICE:
-        case osg::INFO:       return SG_INFO;
-        case osg::DEBUG_FP:
-        case osg::DEBUG_INFO: return SG_DEBUG;
-        default:              return SG_ALERT;
+            case osg::ALWAYS:
+            case osg::FATAL:      return SG_ALERT;
+            case osg::WARN:       return SG_WARN;
+            case osg::NOTICE:
+            case osg::INFO:       return SG_INFO;
+            case osg::DEBUG_FP:
+            case osg::DEBUG_INFO: return SG_DEBUG;
+            default:              return SG_ALERT;
        }
    }
 };
--- a/simgear/debug/debug_types.h
+++ b/simgear/debug/debug_types.h
@@ -1,5 +1,3 @@
-#pragma once
-
 /** \file debug_types.h
 *  Define the various logging classes and priorities
 */
@@ -37,10 +35,7 @@ typedef enum {
    SG_TERRASYNC   = 0x01000000,
    SG_PARTICLES   = 0x02000000,
    SG_HEADLESS    = 0x04000000,
-    // SG_OSG (OSG notify) - will always be displayed regardless of FG log settings as OSG log level is configured 
-    // separately and thus it makes more sense to allow these message through.
-    SG_OSG         = 0x08000000,
-    SG_UNDEFD      = 0x10000000, // For range checking
+    SG_UNDEFD      = 0x08000000, // For range checking

    SG_ALL         = 0xFFFFFFFF
 } sgDebugClass;
@@ -54,17 +49,16 @@ typedef enum {
 * appended, or the priority Nasal reports to compiled code will change.
 */
 typedef enum {
-    SG_BULK = 1, // For frequent messages
-    SG_DEBUG,    // Less frequent debug type messages
-    SG_INFO,     // Informatory messages
-    SG_WARN,     // Possible impending problem
-    SG_ALERT,    // Very possible impending problem
-    SG_POPUP,    // Severe enough to alert using a pop-up window
+    SG_BULK = 1,       // For frequent messages
+    SG_DEBUG,          // Less frequent debug type messages
+    SG_INFO,           // Informatory messages
+    SG_WARN,           // Possible impending problem
+    SG_ALERT,          // Very possible impending problem
+    SG_POPUP,          // Severe enough to alert using a pop-up window
    // SG_EXIT,        // Problem (no core)
    // SG_ABORT        // Abandon ship (core)

-    SG_DEV_WARN,  // Warning for developers, translated to other priority
-    SG_DEV_ALERT, // Alert for developers, translated
-
-    SG_MANDATORY_INFO // information, but should always be shown
+    SG_DEV_WARN,       // Warning for developers, translated to other priority
+    SG_DEV_ALERT       // Alert for developers, translated
 } sgDebugPriority;
+
--- a/simgear/debug/logstream.cxx
+++ b/simgear/debug/logstream.cxx
@@ -24,22 +24,20 @@

 #include "logstream.hxx"

-#include <cstring>
 #include <iostream>
 #include <fstream>
 #include <sstream>
 #include <algorithm>
-#include <mutex>
+
+#include <boost/foreach.hpp>

 #include <simgear/sg_inlines.h>
 #include <simgear/threads/SGThread.hxx>
 #include <simgear/threads/SGQueue.hxx>
+#include <simgear/threads/SGGuard.hxx>

-#include "LogCallback.hxx"
 #include <simgear/io/iostreams/sgstream.hxx>
 #include <simgear/misc/sg_path.hxx>
-#include <simgear/misc/strutils.hxx>
-#include <simgear/timing/timestamp.hxx>

 #if defined (SG_WINDOWS)
 // for AllocConsole, OutputDebugString
@@ -48,55 +46,84 @@
    #include <io.h>
 #endif

+
+
 //////////////////////////////////////////////////////////////////////////////

+namespace simgear
+{

+LogCallback::LogCallback(sgDebugClass c, sgDebugPriority p) :
+	m_class(c),
+	m_priority(p)
+{
+}
+
+bool LogCallback::shouldLog(sgDebugClass c, sgDebugPriority p) const
+{
+	 return ((c & m_class) != 0 && p >= m_priority);
+}
+
+void LogCallback::setLogLevels( sgDebugClass c, sgDebugPriority p )
+{
+	m_priority = p;
+	m_class = c;
+}
+
+const char* LogCallback::debugClassToString(sgDebugClass c)
+{
+    switch (c) {
+        case SG_NONE:       return "none";
+        case SG_TERRAIN:    return "terrain";
+        case SG_ASTRO:      return "astro";
+        case SG_FLIGHT:     return "flight";
+        case SG_INPUT:      return "input";
+        case SG_GL:         return "opengl";
+        case SG_VIEW:       return "view";
+        case SG_COCKPIT:    return "cockpit";
+        case SG_GENERAL:    return "general";
+        case SG_MATH:       return "math";
+        case SG_EVENT:      return "event";
+        case SG_AIRCRAFT:   return "aircraft";
+        case SG_AUTOPILOT:  return "autopilot";
+        case SG_IO:         return "io";
+        case SG_CLIPPER:    return "clipper";
+        case SG_NETWORK:    return "network";
+        case SG_ATC:        return "atc";
+        case SG_NASAL:      return "nasal";
+        case SG_INSTR:      return "instruments";
+        case SG_SYSTEMS:    return "systems";
+        case SG_AI:         return "ai";
+        case SG_ENVIRONMENT:return "environment";
+        case SG_SOUND:      return "sound";
+        case SG_NAVAID:     return "navaid";
+        case SG_GUI:        return "gui";
+        case SG_TERRASYNC:  return "terrasync";
+        case SG_PARTICLES:  return "particles";
+        case SG_HEADLESS:   return "headless";
+        default:            return "unknown";
+    }
+}
+
+} // of namespace simgear
+
+//////////////////////////////////////////////////////////////////////////////

 class FileLogCallback : public simgear::LogCallback
 {
 public:
-    SGTimeStamp logTimer;
    FileLogCallback(const SGPath& aPath, sgDebugClass c, sgDebugPriority p) :
 	    simgear::LogCallback(c, p)
    {
        m_file.open(aPath, std::ios_base::out | std::ios_base::trunc);
-        logTimer.stamp();
    }

-    void operator()(sgDebugClass c, sgDebugPriority p,
-                    const char* file, int line, const std::string& message) override
+    virtual void operator()(sgDebugClass c, sgDebugPriority p,
+        const char* file, int line, const std::string& message)
    {
        if (!shouldLog(c, p)) return;
-
-
-//        fprintf(stderr, "%7.2f [%.8s]:%-10s %s\n", logTimer.elapsedMSec() / 1000.0, debugPriorityToString(p), debugClassToString(c), aMessage.c_str());
-        m_file
-            << std::fixed
-            << std::setprecision(2)
-            << std::setw(8)
-            << std::right
-            << (logTimer.elapsedMSec() / 1000.0)
-            << std::setw(8)
-            << std::left
-            << " ["+std::string(debugPriorityToString(p))+"]:"
-            << std::setw(10)
-            << std::left
-            << debugClassToString(c)
-            ;
-        if (file) {
-            /* <line> can be -ve to indicate that m_fileLine was false, but we
-            want to show file:line information regardless of m_fileLine. */
-            m_file
-                << file
-                << ":"
-                << abs(line)
-                << ": "
-                ;
-            }
-        m_file
-            << message << std::endl;
-        //m_file << debugClassToString(c) << ":" << (int)p
-        //    << ":" << file << ":" << line << ":" << message << std::endl;
+        m_file << debugClassToString(c) << ":" << (int) p
+            << ":" << file << ":" << line << ":" << message << std::endl;
    }
 private:
    sg_ofstream m_file;
@@ -105,12 +132,9 @@ private:
 class StderrLogCallback : public simgear::LogCallback
 {
 public:
-    SGTimeStamp logTimer;
-
    StderrLogCallback(sgDebugClass c, sgDebugPriority p) :
 		simgear::LogCallback(c, p)
    {
-        logTimer.stamp();
    }

 #if defined (SG_WINDOWS)
@@ -120,19 +144,12 @@ public:
    }
 #endif

-    void operator()(sgDebugClass c, sgDebugPriority p,
-                    const char* file, int line, const std::string& aMessage) override
+    virtual void operator()(sgDebugClass c, sgDebugPriority p,
+        const char* file, int line, const std::string& aMessage)
    {
        if (!shouldLog(c, p)) return;
-        //fprintf(stderr, "%s\n", aMessage.c_str());

-        if (file && line > 0) {
-            fprintf(stderr, "%8.2f %s:%i: [%.8s]:%-10s %s\n", logTimer.elapsedMSec()/1000.0, file, line, debugPriorityToString(p), debugClassToString(c), aMessage.c_str());
-        }
-        else {
-            fprintf(stderr, "%8.2f [%.8s]:%-10s %s\n", logTimer.elapsedMSec()/1000.0, debugPriorityToString(p), debugClassToString(c), aMessage.c_str());
-        }
-        //    file, line, aMessage.c_str());
+        fprintf(stderr, "%s\n", aMessage.c_str());
        //fprintf(stderr, "%s:%d:%s:%d:%s\n", debugClassToString(c), p,
        //    file, line, aMessage.c_str());
        fflush(stderr);
@@ -150,8 +167,8 @@ public:
    {
    }

-    void operator()(sgDebugClass c, sgDebugPriority p,
-                    const char* file, int line, const std::string& aMessage) override
+    virtual void operator()(sgDebugClass c, sgDebugPriority p,
+        const char* file, int line, const std::string& aMessage)
    {
        if (!shouldLog(c, p)) return;

@@ -166,6 +183,28 @@ public:
 class logstream::LogStreamPrivate : public SGThread
 {
 private:
+    /**
+     * storage of a single log entry. This is used to pass log entries from
+     * the various threads to the logging thread, and also to store the startup
+     * entries
+     */
+    class LogEntry
+    {
+    public:
+        LogEntry(sgDebugClass c, sgDebugPriority p,
+            const char* f, int l, const std::string& msg) :
+            debugClass(c), debugPriority(p), file(f), line(l),
+                message(msg)
+        {
+        }
+
+        const sgDebugClass debugClass;
+        const sgDebugPriority debugPriority;
+        const char* file;
+        const int line;
+        const std::string message;
+    };
+
    /**
     * RAII object to pause the logging thread if it's running, and restart it.
     * used to safely make configuration changes.
@@ -204,10 +243,10 @@ public:
         *    window; stdout/stderr will not appear (except in logfiles as they do now)
         * 4) When started from the Console (with --console) open a new console window
         * 5) Ensure that IO redirection still works when started from the console
-         *
+         * 
         * Notes:
         * 1) fgfs needs to be a GUI subsystem app - which it already is
-         * 2) What can't be done is to make the cmd prompt run fgfs synchronously;
+         * 2) What can't be done is to make the cmd prompt run fgfs synchronously; 
         * this is only something that can be done via "start /wait fgfs".
         */

@@ -231,7 +270,7 @@ public:
 			}
        } else {
            /*
-            * Attempt to attach to the console process of the parent process; when launched from cmd.exe this should be the console,
+            * Attempt to attach to the console process of the parent process; when launched from cmd.exe this should be the console, 
            * when launched via the RUN menu explorer, or another GUI app that wasn't started from the console this will fail.
            * When it fails we will redirect to the NUL device. This is to ensure that we have valid streams.
            * Later on in the initialisation sequence the --console option will be processed and this will cause the requestConsole() to
@@ -261,7 +300,7 @@ public:
            if (!stdout_isNull){
                if (!m_stdout_isRedirectedAlready)
                    freopen("conout$", "w", stdout);
-                else
+                else 
                    /*
                    * for already redirected streams we need to attach the stream to the OS handle that is open.
                    * - this comes from part of the answer http://stackoverflow.com/a/13841522
@@ -280,7 +319,7 @@ public:
            }
        }
        //http://stackoverflow.com/a/25927081
-        //Clear the error state for each of the C++ standard stream objects.
+        //Clear the error state for each of the C++ standard stream objects. 
        std::wcout.clear();
        std::cout.clear();
        std::wcerr.clear();
@@ -289,34 +328,22 @@ public:

        m_callbacks.push_back(new StderrLogCallback(m_logClass, m_logPriority));
        m_consoleCallbacks.push_back(m_callbacks.back());
-        
-#if defined (SG_WINDOWS)
-        const char* winDebugEnv = ::getenv("SG_WINDEBUG");
-        const bool b = winDebugEnv ? simgear::strutils::to_bool(std::string{winDebugEnv}) : false;
-        if (b) {
-            m_callbacks.push_back(new WinDebugLogCallback(m_logClass, m_logPriority));
-            m_consoleCallbacks.push_back(m_callbacks.back());
-        }
+#if defined (SG_WINDOWS) && !defined(NDEBUG)
+		m_callbacks.push_back(new WinDebugLogCallback(m_logClass, m_logPriority));
+		m_consoleCallbacks.push_back(m_callbacks.back());
 #endif
    }

    ~LogStreamPrivate()
    {
        removeCallbacks();
-
-        // house-keeping, avoid leak warnings if we exit before disabling
-        // startup logging
-        {
-            std::lock_guard<std::mutex> g(m_lock);
-            clearStartupEntriesLocked();
-        }
    }

-    std::mutex m_lock;
-    SGBlockingQueue<simgear::LogEntry> m_entries;
+    SGMutex m_lock;
+    SGBlockingQueue<LogEntry> m_entries;

    // log entries posted during startup
-    std::vector<simgear::LogEntry> m_startupEntries;
+    std::vector<LogEntry> m_startupEntries;
    bool m_startupLogging = false;

    typedef std::vector<simgear::LogCallback*> CallbackVec;
@@ -334,16 +361,13 @@ public:
    bool m_stdout_isRedirectedAlready = false;
 #endif
    bool m_developerMode = false;
-    bool m_fileLine = false;

    // test suite mode.
    bool m_testMode = false;

-    std::vector<std::string> _popupMessages;
-
    void startLog()
    {
-        std::lock_guard<std::mutex> g(m_lock);
+        SGGuard<SGMutex> g(m_lock);
        if (m_isRunning) return;
        m_isRunning = true;
        start();
@@ -355,54 +379,44 @@ public:
            return;
        }

-        {
-            std::lock_guard<std::mutex> g(m_lock);
-            m_startupLogging = on;
-            clearStartupEntriesLocked();
-        }
-    }
-
-    void clearStartupEntriesLocked()
-    {
+        m_startupLogging = on;
        m_startupEntries.clear();
    }

-    void run() override
+    virtual void run()
    {
        while (1) {
-            simgear::LogEntry entry(m_entries.pop());
+            LogEntry entry(m_entries.pop());
            // special marker entry detected, terminate the thread since we are
            // making a configuration change or quitting the app
-            if ((entry.debugClass == SG_NONE) && entry.file && !strcmp(entry.file, "done")) {
+            if ((entry.debugClass == SG_NONE) && !strcmp(entry.file, "done")) {
                return;
            }
-            {
-                std::lock_guard<std::mutex> g(m_lock);
-                if (m_startupLogging) {
-                    // save to the startup list for not-yet-added callbacks to
-                    // pull down on startup
-                    m_startupEntries.push_back(entry);
-                }
+
+            if (m_startupLogging) {
+                // save to the startup list for not-yet-added callbacks to
+                // pull down on startup
+                m_startupEntries.push_back(entry);
            }
+
            // submit to each installed callback in turn
            for (simgear::LogCallback* cb : m_callbacks) {
-                cb->processEntry(entry);
+                (*cb)(entry.debugClass, entry.debugPriority,
+                    entry.file, entry.line, entry.message);
            }
        } // of main thread loop
    }

    bool stop()
    {
-        {
-            std::lock_guard<std::mutex> g(m_lock);
-            if (!m_isRunning) {
-                return false;
-            }
-
-            // log a special marker value, which will cause the thread to wakeup,
-            // and then exit
-            log(SG_NONE, SG_ALERT, "done", -1, "", false);
+        SGGuard<SGMutex> g(m_lock);
+        if (!m_isRunning) {
+            return false;
        }
+
+        // log a special marker value, which will cause the thread to wakeup,
+        // and then exit
+        log(SG_NONE, SG_ALERT, "done", -1, "");
        join();

        m_isRunning = false;
@@ -416,8 +430,9 @@ public:

        // we clear startup entries not using this, so always safe to run
        // this code, container will simply be empty
-        for (const auto& entry : m_startupEntries) {
-            cb->processEntry(entry);
+        for (auto entry : m_startupEntries) {
+            (*cb)(entry.debugClass, entry.debugPriority,
+               entry.file, entry.line, entry.message);
        }
    }

@@ -445,9 +460,9 @@ public:
        PauseThread pause(this);
        m_logPriority = p;
        m_logClass = c;
-        for (auto cb : m_consoleCallbacks) {
-            cb->setLogLevels(c, p);
-        }
+		BOOST_FOREACH(simgear::LogCallback* cb, m_consoleCallbacks) {
+	        cb->setLogLevels(c, p);
+		}
    }

    bool would_log( sgDebugClass c, sgDebugPriority p ) const
@@ -455,27 +470,16 @@ public:
        // Testing mode, so always log.
        if (m_testMode) return true;

-        // SG_OSG (OSG notify) - will always be displayed regardless of FG log settings as OSG log level is configured
-        // separately and thus it makes more sense to allow these message through.
-        if (static_cast<unsigned>(p) == static_cast<unsigned>(SG_OSG)) return true;
-
        p = translatePriority(p);
        if (p >= SG_INFO) return true;
        return ((c & m_logClass) != 0 && p >= m_logPriority);
    }

    void log( sgDebugClass c, sgDebugPriority p,
-            const char* fileName, int line, const std::string& msg,
-             bool freeFilename)
+            const char* fileName, int line, const std::string& msg)
    {
-        auto tp = translatePriority(p);
-        if (!m_fileLine) {
-            /* This prevents output of file:line in StderrLogCallback. */
-            line = -line;
-        }
-
-        simgear::LogEntry entry(c, tp, p, fileName, line, msg);
-        entry.freeFilename = freeFilename;
+        p = translatePriority(p);
+        LogEntry entry(c, p, fileName, line, msg);
        m_entries.push(entry);
    }

@@ -486,7 +490,7 @@ public:
        }

        if (in == SG_DEV_ALERT) {
-            return m_developerMode ? SG_ALERT : SG_WARN;
+            return m_developerMode ? SG_POPUP : SG_WARN;
        }

        return in;
@@ -496,7 +500,7 @@ public:
 /////////////////////////////////////////////////////////////////////////////

 static std::unique_ptr<logstream> global_logstream;
-static std::mutex global_logStreamLock;
+static SGMutex global_logStreamLock;

 logstream::logstream()
 {
@@ -506,8 +510,8 @@ logstream::logstream()

 logstream::~logstream()
 {
+    popup_msgs.clear();
    d->stop();
-    d.reset();
 }

 void
@@ -521,10 +525,6 @@ void logstream::setDeveloperMode(bool devMode)
    d->m_developerMode = devMode;
 }

-void logstream::setFileLine(bool fileLine)
-{
-    d->m_fileLine = fileLine;
-}

 void
 logstream::addCallback(simgear::LogCallback* cb)
@@ -542,14 +542,7 @@ void
 logstream::log( sgDebugClass c, sgDebugPriority p,
        const char* fileName, int line, const std::string& msg)
 {
-    d->log(c, p, fileName, line, msg, false);
-}
-
-void
-logstream::logCopyingFilename( sgDebugClass c, sgDebugPriority p,
-         const char* fileName, int line, const std::string& msg)
-{
-    d->log(c, p, strdup(fileName), line, msg, true);
+    d->log(c, p, fileName, line, msg);
 }


@@ -610,18 +603,17 @@ void logstream::hexdump(sgDebugClass c, sgDebugPriority p, const char* fileName,
 void
 logstream::popup( const std::string& msg)
 {
-    std::lock_guard<std::mutex> g(d->m_lock);
-    d->_popupMessages.push_back(msg);
+    popup_msgs.push_back(msg);
 }

 std::string
 logstream::get_popup()
 {
-    std::string rv;
-    std::lock_guard<std::mutex> g(d->m_lock);
-    if (!d->_popupMessages.empty()) {
-        rv = d->_popupMessages.front();
-        d->_popupMessages.erase(d->_popupMessages.begin());
+    std::string rv = "";
+    if (!popup_msgs.empty())
+    {
+        rv = popup_msgs.front();
+        popup_msgs.erase(popup_msgs.begin());
    }
    return rv;
 }
@@ -629,8 +621,7 @@ logstream::get_popup()
 bool
 logstream::has_popup()
 {
-    std::lock_guard<std::mutex> g(d->m_lock);
-    return !d->_popupMessages.empty();
+    return (popup_msgs.size() > 0) ? true : false;
 }

 bool
@@ -663,16 +654,6 @@ logstream::set_log_classes( sgDebugClass c)
    d->setLogLevels(c, d->m_logPriority);
 }

-sgDebugPriority logstream::priorityFromString(const std::string& s)
-{
-    if (s == "bulk") return SG_BULK;
-    if (s == "debug") return SG_DEBUG;
-    if (s == "info") return SG_INFO;
-    if (s == "warn") return SG_WARN;
-    if (s == "alert") return SG_ALERT;
-
-    throw std::invalid_argument("Couldn't parse log prioirty:" + s);
-}

 logstream&
 sglog()
@@ -683,7 +664,7 @@ sglog()
    // http://www.aristeia.com/Papers/DDJ_Jul_Aug_2004_revised.pdf
    // in the absence of portable memory barrier ops in Simgear,
    // let's keep this correct & safe
-    std::lock_guard<std::mutex> g(global_logStreamLock);
+    SGGuard<SGMutex> g(global_logStreamLock);

    if( !global_logstream )
        global_logstream.reset(new logstream);
@@ -757,14 +738,14 @@ namespace simgear
 {

 void requestConsole()
-{
+{ 
    sglog().requestConsole();
 }


 void shutdownLogging()
 {
-    std::lock_guard<std::mutex> g(global_logStreamLock);
+    SGGuard<SGMutex> g(global_logStreamLock);
    global_logstream.reset();
 }

--- a/simgear/debug/logstream.hxx
+++ b/simgear/debug/logstream.hxx
@@ -37,8 +37,26 @@ class SGPath;
      
 namespace simgear
 {
+     
+class LogCallback
+{
+public:
+    virtual ~LogCallback() {}
+    virtual void operator()(sgDebugClass c, sgDebugPriority p, 
+        const char* file, int line, const std::string& aMessage) = 0;
+
+	void setLogLevels(sgDebugClass c, sgDebugPriority p);
+protected:
+	LogCallback(sgDebugClass c, sgDebugPriority p);
+
+	bool shouldLog(sgDebugClass c, sgDebugPriority p) const;
+
+    static const char* debugClassToString(sgDebugClass c);
+private:
+	sgDebugClass m_class;
+	sgDebugPriority m_priority;
+};

-class LogCallback;
 /**
 * Helper force a console on platforms where it might optional, when
 * we need to show a console. This basically means Windows at the
@@ -86,11 +104,6 @@ public:
    
    sgDebugPriority get_log_priority() const;

-    /**
-        @brief convert a string value to a log prioirty.
-        throws std::invalid_argument if the string is not valid
-     */
-    static sgDebugPriority priorityFromString(const std::string& s);
    /**
     * set developer mode on/off. In developer mode, SG_DEV_WARN messags
     * are treated as warnings. In normal (non-developer) mode they are
@@ -98,26 +111,12 @@ public:
     */
    void setDeveloperMode(bool devMode);

-    /**
-     * set output of file:line mode on/off. If on, all log messages are
-     * prefixed by the file:line of the caller of SG_LOG().
-     */
-    void setFileLine(bool fileLine);
-
    /**
     * the core logging method
     */
    void log( sgDebugClass c, sgDebugPriority p,
            const char* fileName, int line, const std::string& msg);

-    // overload of above, which can transfer ownership of the file-name.
-    // this is unecesary overhead when logging from C++, since __FILE__ points
-    // to constant data, but it's needed when the filename is Nasal data (for
-    // example) since during shutdown the filename is freed by Nasal GC
-    // asynchronously with the logging thread.
-    void logCopyingFilename( sgDebugClass c, sgDebugPriority p,
-             const char* fileName, int line, const std::string& msg);
-    
    /**
    * output formatted hex dump of memory block
    */
@@ -179,6 +178,8 @@ private:
    // constructor
    logstream();

+    std::vector<std::string> popup_msgs;
+
    class LogStreamPrivate;

    std::unique_ptr<LogStreamPrivate> d;
@@ -202,11 +203,9 @@ logstream& sglog();
    } } while(0)
 #ifdef FG_NDEBUG
 # define SG_LOG(C,P,M)	do { if((P) == SG_POPUP) SG_LOGX(C,P,M) } while(0)
-# define SG_LOG_NAN(C,P,M) SG_LOG(C,P,M)
 # define SG_HEXDUMP(C,P,MEM,LEN)
 #else
 # define SG_LOG(C,P,M)	SG_LOGX(C,P,M)
-# define SG_LOG_NAN(C,P,M) do { SG_LOGX(C,P,M); throw std::overflow_error(M); } while(0)
 # define SG_LOG_HEXDUMP(C,P,MEM,LEN) if(sglog().would_log(C,P)) sglog().hexdump(C, P, __FILE__, __LINE__, MEM, LEN)
 #endif

--- a/simgear/emesary/CMakeLists.txt
+++ b/simgear/emesary/CMakeLists.txt
@@ -1,33 +0,0 @@
-
-
-include (SimGearComponent)
-
-set(HEADERS 
-    Emesary.hxx
-    INotification.hxx
-    IReceiver.hxx
-    ITransmitter.hxx
-    ReceiptStatus.hxx
-    Transmitter.hxx
-    notifications.hxx
-    )
-    
-set(SOURCES 
-    Emesary.cxx
-    )
-
-simgear_component(emesary emesary "${SOURCES}" "${HEADERS}")
-
-
-if(ENABLE_TESTS)
-
-add_executable(test_emesary test_emesary.cxx)
-
-set_target_properties(test_emesary PROPERTIES
-  COMPILE_DEFINITIONS "SRC_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}\"" )
-
-target_link_libraries(test_emesary ${TEST_LIBS})
-add_test(emesary ${EXECUTABLE_OUTPUT_PATH}/test_emesary)
-
-
-endif(ENABLE_TESTS)
--- a/simgear/emesary/Emesary.cxx
+++ b/simgear/emesary/Emesary.cxx
@@ -1,31 +0,0 @@
-/*---------------------------------------------------------------------------
-*
-*	Title                : Emesary - class based inter-object communication
-*
-*	File Type            : Implementation File
-*
-*	Description          : Emesary main.
-*	                     : This only needs to instance the GlobalTransmitter as all of the 
-*	                     : logic is in the header files (by design)
-*
-*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
-*
-*	Author               : Richard Harrison (richard@zaretto.com)
-*
-*	Creation Date        : 18 March 2002
-*
-*	Version              : $Header: $
-*
-*  Copyright © 2002 Richard Harrison           All Rights Reserved.
-*
-*---------------------------------------------------------------------------*/
-
-#include "simgear/emesary/Emesary.hxx"
-
-namespace simgear
-{
-    namespace Emesary
-    {
-      
-    }
-}
--- a/simgear/emesary/Emesary.hxx
+++ b/simgear/emesary/Emesary.hxx
@@ -1,48 +0,0 @@
-#ifndef EMESARY_hxx
-#define EMESARY_hxx
-/*---------------------------------------------------------------------------
-*
-*  Title                : Emesary - class based inter-object communication
-*
-*  File Type            : Implementation File
-*
-*  Description          : Provides generic inter-object communication. For an object to receive a message it
-*                       : must first register with a Transmitter, such as GlobalTransmitter, and implement the
-*                       : IReceiver interface. That's it.
-*                       : To send a message use a Transmitter with an object. That's all there is to it.
-*
-*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
-*
-*  Author               : Richard Harrison (richard@zaretto.com)
-*
-*  Creation Date        : 18 March 2002, rewrite 2017, simgear version 2019
-*
-*  Version              : $Header: $
-*
-*  Copyright (C)2019 Richard Harrison            Licenced under GPL2 or later.
-*
-*---------------------------------------------------------------------------*/
-#include <typeinfo>
-
-#include "ReceiptStatus.hxx"
-#include "INotification.hxx"
-#include "IReceiver.hxx"
-#include "ITransmitter.hxx"
-#include "Transmitter.hxx"
-#include <simgear/structure/Singleton.hxx>
-
-namespace simgear
-{
-    namespace Emesary
-    {
-        class GlobalTransmitter : public simgear::Singleton<Transmitter>
-        {
-        public:
-            GlobalTransmitter()
-            {
-            }
-            virtual ~GlobalTransmitter() {}
-        };
-    }
-}
-#endif
--- a/simgear/emesary/INotification.hxx
+++ b/simgear/emesary/INotification.hxx
@@ -1,54 +0,0 @@
-#ifndef INOTIFICATION_hxx
-#define INOTIFICATION_hxx
-/*---------------------------------------------------------------------------
-*
-*  Title                : Emesary - Notification base class
-*
-*  File Type            : Implementation File
-*
-*  Description          : Base class (interface) for all Notifications.
-*                       : This is also compatible with the usual implementation of how we
-*                       : implement queued notifications.
-*
-*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
-*
-*  Author               : Richard Harrison (richard@zaretto.com)
-*
-*  Creation Date        : 18 March 2002, rewrite 2017, simgear version 2019
-*
-*  Version              : $Header: $
-*
-*  Copyright (C)2019 Richard Harrison            Licenced under GPL2 or later.
-*
-*---------------------------------------------------------------------------*/
-namespace simgear
-{
-    namespace Emesary
-    {
-        /// Interface (base class) for all notifications. 
-        class INotification
-        {
-        public:
-            // text representation of notification type. must be unique across all notifications
-            virtual const char *GetType() = 0;
-
-            /// Used to control the sending of notifications. If this returns false then the Transmitter 
-            /// should not send this notification.
-            virtual bool IsReadyToSend() { return true; }
-
-            /// Used to control the timeout. If this notification has timed out - then the processor is entitled 
-            /// to true.
-            virtual bool IsTimedOut() { return false; }
-
-            /// when this notification has completed the processing recipient must set this to true.
-            /// the processing recipient is responsible for follow on notifications.
-            /// a notification can remain as complete until the transmit queue decides to remove it from the queue.
-            /// there is no requirement that elements are removed immediately upon completion merely that once complete
-            /// the transmitter should not notify any more elements.
-            /// The current notification loop may be completed - following the usual convention unless Completed or Abort
-            /// is returned as the status.
-            virtual bool IsComplete() { return true; }
-        };
-    }
-}
-#endif
--- a/simgear/emesary/IReceiver.hxx
+++ b/simgear/emesary/IReceiver.hxx
@@ -1,47 +0,0 @@
-#ifndef IRECEIVER_hxx
-#define IRECEIVER_hxx
-/*---------------------------------------------------------------------------
-*
-*  Title                : Emesary - Receiver base class
-*
-*  File Type            : Implementation File
-*
-*  Description          : Base class for all recipients.
-*
-*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
-*
-*  Author               : Richard Harrison (richard@zaretto.com)
-*
-*  Creation Date        : 18 March 2002, rewrite 2017, simgear version 2019
-*
-*  Version              : $Header: $
-*
-*  Copyright (C)2019 Richard Harrison            Licenced under GPL2 or later.
-*
-*---------------------------------------------------------------------------*/
-namespace simgear
-{
-    namespace Emesary
-    {
-
-        /// Interface (base class) for a recipeint.
-        class IReceiver
-        {
-        public:
-            /// Receive notification - must be implemented
-            virtual ReceiptStatus Receive(INotification& message) = 0;
-
-            /// Called when registered at a transmitter
-            virtual void OnRegisteredAtTransmitter(class Transmitter *p)
-            {
-            }
-
-            /// Called when de-registered at a transmitter
-            virtual void OnDeRegisteredAtTransmitter(class Transmitter *p)
-            {
-            }
-        };
-
-    }
-}
-#endif
--- a/simgear/emesary/ITransmitter.hxx
+++ b/simgear/emesary/ITransmitter.hxx
@@ -1,52 +0,0 @@
-#ifndef ITRANSMITTER_hxx
-#define ITRANSMITTER_hxx
-/*---------------------------------------------------------------------------
-*
-*  Title                : Emesary - Transmitter base class
-*
-*  File Type            : Implementation File
-*
-*  Description          : Base class for all transmitters.
-*
-*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
-*
-*  Author               : Richard Harrison (richard@zaretto.com)
-*
-*  Creation Date        : 18 March 2002, rewrite 2017, simgear version 2019
-*
-*  Version              : $Header: $
-*
-*  Copyright (C)2019 Richard Harrison            Licenced under GPL2 or later.
-*
-*---------------------------------------------------------------------------*/
-
-namespace simgear
-{
-    namespace Emesary
-    {
-        /// Interface (base clasee) for a transmitter.
-        ///  Transmits Message derived objects. Each instance of this class provides a
-        ///  event/databus to which any number of receivers can attach to.
-        class ITransmitter
-        {
-        public:
-            // Registers a recipient to receive message from this transmitter
-            virtual void Register(IReceiver& R) = 0;
-            // Removes a recipient from from this transmitter
-            virtual void DeRegister(IReceiver& R) = 0;
-
-
-            //Notify all registered recipients. Stop when receipt status of abort or finished are received.
-            //The receipt status from this method will be
-            // - OK > message handled
-            // - Fail > message not handled. A status of Abort from a recipient will result in our status
-            //          being fail as Abort means that the message was not and cannot be handled, and
-            //          allows for usages such as access controls.
-            virtual ReceiptStatus NotifyAll(INotification& M) = 0;
-
-            /// number of recipients
-            virtual int Count() = 0;
-        };
-    }
-}
-#endif
--- a/simgear/emesary/ReceiptStatus.hxx
+++ b/simgear/emesary/ReceiptStatus.hxx
@@ -1,54 +0,0 @@
-#ifndef RECEIPTSTATUS_hxx
-#define RECEIPTSTATUS_hxx
-/*---------------------------------------------------------------------------
-*
-*  Title                : Emesary - Transmitter base class
-*
-*  File Type            : Implementation File
-*
-*  Description          : Defines the receipt status that can be returned from 
-*                       : a receive method.
-*
-*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
-*
-*  Author               : Richard Harrison (richard@zaretto.com)
-*
-*  Creation Date        : 18 March 2002, rewrite 2017, simgear version 2019
-*
-*  Version              : $Header: $
-*
-*  Copyright (C)2019 Richard Harrison            Licenced under GPL2 or later.
-*
-*---------------------------------------------------------------------------*/
-namespace simgear
-{
-    namespace Emesary
-    {
-        enum ReceiptStatus
-        {
-            /// Processing completed successfully
-            ReceiptStatusOK = 0,
-
-            /// Individual item failure
-            ReceiptStatusFail = 1,
-
-            /// Fatal error; stop processing any further recipieints of this message. Implicitly fail
-            ReceiptStatusAbort = 2,
-
-            /// Definitive completion - do not send message to any further recipieints
-            ReceiptStatusFinished = 3,
-
-            /// Return value when method doesn't process a message.
-            ReceiptStatusNotProcessed = 4,
-
-            /// Message has been sent but the return status cannot be determined as it has not been processed by the recipient. 
-            /// e.g. a queue or outgoing bridge
-            ReceiptStatusPending = 5,
-
-            /// Message has been definitively handled but the return value cannot be determined. The message will not be sent any further
-            /// e.g. a point to point forwarding bridge
-            ReceiptStatusPendingFinished = 6,
-        };
-    }
-}
-#endif
--- a/simgear/emesary/Transmitter.hxx
+++ b/simgear/emesary/Transmitter.hxx
@@ -1,203 +0,0 @@
-#ifndef TRANSMITTER_hxx
-#define TRANSMITTER_hxx
-/*---------------------------------------------------------------------------
-*
-*  Title                : Emesary - Transmitter base class
-*
-*  File Type            : Implementation File
-*
-*  Description          : Defines the receipt status that can be returned from
-*                       : a receive method.
-*
-*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
-*
-*  Author               : Richard Harrison (richard@zaretto.com)
-*
-*  Creation Date        : 18 March 2002, rewrite 2017, simgear version 2019
-*
-*  Version              : $Header: $
-*
-*  Copyright (C)2019 Richard Harrison            Licenced under GPL2 or later.
-*
-*---------------------------------------------------------------------------*/
-
-#include <algorithm>
-#include <string>
-#include <list>
-#include <set>
-#include <vector>
-#include <atomic>
-#include <mutex>
-
-namespace simgear
-{
-    namespace Emesary
-    {
-        // Implementation of a ITransmitter
-        class Transmitter : public ITransmitter
-        {
-        protected:
-            typedef std::list<IReceiver *> RecipientList;
-            RecipientList recipient_list;
-            RecipientList deleted_recipients;
-            int CurrentRecipientIndex = 0;
-            std::mutex _lock;
-            std::atomic<int> receiveDepth;
-            std::atomic<int> sentMessageCount;
-
-            void UnlockList()
-            {
-                _lock.unlock();
-            }
-            void LockList()
-            {
-                _lock.lock();
-            }
-        public:
-            Transmitter() : receiveDepth(0), sentMessageCount(0)
-            {
-            }
-
-            virtual ~Transmitter()
-            {
-            }
-
-            // Registers an object to receive messsages from this transmitter.
-            // This object is added to the top of the list of objects to be notified. This is deliberate as
-            // the sequence of registration and message receipt can influence the way messages are processing
-            // when ReceiptStatus of Abort or Finished are encountered. So it was a deliberate decision that the
-            // most recently registered recipients should process the messages/events first.
-            virtual void Register(IReceiver& r)
-            {
-                LockList();
-                recipient_list.push_back(&r);
-                r.OnRegisteredAtTransmitter(this);
-                if (std::find(deleted_recipients.begin(), deleted_recipients.end(), &r) != deleted_recipients.end())
-                    deleted_recipients.remove(&r);
-
-                UnlockList();
-            }
-
-            //  Removes an object from receving message from this transmitter
-            virtual void DeRegister(IReceiver& R)
-            {
-                LockList();
-                //printf("Remove %x\n", &R);
-                if (recipient_list.size())
-                {
-                    if (std::find(recipient_list.begin(), recipient_list.end(), &R) != recipient_list.end())
-                    {
-                        recipient_list.remove(&R);
-                        R.OnDeRegisteredAtTransmitter(this);
-                        if (std::find(deleted_recipients.begin(), deleted_recipients.end(), &R) == deleted_recipients.end())
-                            deleted_recipients.push_back(&R);
-                    }
-                }
-                UnlockList();
-            }
-
-            // Notify all registered recipients. Stop when receipt status of abort or finished are received.
-            // The receipt status from this method will be
-            //  - OK > message handled
-            //  - Fail > message not handled. A status of Abort from a recipient will result in our status
-            //           being fail as Abort means that the message was not and cannot be handled, and
-            //           allows for usages such as access controls.
-            virtual ReceiptStatus NotifyAll(INotification& M)
-            {
-                ReceiptStatus return_status = ReceiptStatusNotProcessed;
-
-                sentMessageCount++;
-                try
-                {
-                    LockList();
-                    if (receiveDepth == 0)
-                        deleted_recipients.clear();
-                    receiveDepth++;
-                    std::vector<IReceiver*> temp(recipient_list.size());
-                    int idx = 0;
-                    for (RecipientList::iterator i = recipient_list.begin(); i != recipient_list.end(); i++)
-                    {
-                        temp[idx++] = *i;
-                    }
-                    UnlockList();
-                    int tempSize = temp.size();
-                    for (int index = 0; index < tempSize; index++)
-                    {
-                        IReceiver* R = temp[index];
-                        LockList();
-                        if (deleted_recipients.size())
-                        {
-                            if (std::find(deleted_recipients.begin(), deleted_recipients.end(), R) != deleted_recipients.end())
-                            {
-                                UnlockList();
-                                continue;
-                            }
-                        }
-                        UnlockList();
-                        if (R)
-                        {
-                            ReceiptStatus rstat = R->Receive(M);
-                            switch (rstat)
-                            {
-                            case ReceiptStatusFail:
-                                return_status = ReceiptStatusFail;
-                                break;
-                            case ReceiptStatusPending:
-                                return_status = ReceiptStatusPending;
-                                break;
-                            case ReceiptStatusPendingFinished:
-                                return rstat;
-
-                            case ReceiptStatusNotProcessed:
-                                break;
-                            case ReceiptStatusOK:
-                                if (return_status == ReceiptStatusNotProcessed)
-                                    return_status = rstat;
-                                break;
-
-                            case ReceiptStatusAbort:
-                                return ReceiptStatusAbort;
-
-                            case ReceiptStatusFinished:
-                                return ReceiptStatusOK;
-                            }
-                        }
-
-                    }
-                }
-                catch (...)
-                {
-                    throw;
-                    // return_status = ReceiptStatusAbort;
-                }
-                receiveDepth--;
-                return return_status;
-            }
-
-            // number of currently registered recipients
-            virtual int Count()
-            {
-                LockList();
-                return recipient_list.size();
-                UnlockList();
-            }
-
-            // number of sent messages.
-            int SentMessageCount()
-            {
-                return sentMessageCount;
-            }
-
-            // ascertain if a receipt status can be interpreted as failure.
-            static bool Failed(ReceiptStatus receiptStatus)
-            {
-                //
-                // failed is either Fail or Abort.
-                // NotProcessed isn't a failure because it hasn't been processed.
-                return receiptStatus == ReceiptStatusFail
-                    || receiptStatus == ReceiptStatusAbort;
-            }
-        };
-    }
-}
-#endif
--- a/simgear/emesary/notifications.hxx
+++ b/simgear/emesary/notifications.hxx
@@ -1,68 +0,0 @@
-#ifndef NOTIFICATIONS_hxx
-#define NOTIFICATIONS_hxx
-/*---------------------------------------------------------------------------
-*
-*	Title                : Emesary - class based inter-object communication
-*
-*	File Type            : Implementation File
-*
-*	Description          : simgear notifications
-*
-*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
-*
-*	Author               : Richard Harrison (richard@zaretto.com)
-*
-*	Creation Date        : 18 March 2002, rewrite 2017
-*
-*	Version              : $Header: $
-*
-*  Copyright <20> 2002 - 2017 Richard Harrison           All Rights Reserved.
-*
-*---------------------------------------------------------------------------*/
-
-#include "INotification.hxx"
-
-namespace simgear
-{
-    namespace Notifications
-    {
-        class MainLoopNotification : public simgear::Emesary::INotification
-        {
-        public:
-            enum Type { Started, Stopped, Begin, End };
-            MainLoopNotification(Type v) : _type(v) {}
-
-            virtual Type GetValue() { return _type; }
-            virtual const char *GetType() { return "MainLoop"; }
-
-        protected:
-            Type _type;
-        };
-
-        class NasalGarbageCollectionConfigurationNotification : public simgear::Emesary::INotification
-        {
-        public:
-            NasalGarbageCollectionConfigurationNotification(bool canWait, bool active) : CanWait(canWait), Active(active) {}
-
-            virtual bool GetCanWait() { return CanWait; }
-            virtual bool GetActive() { return Active; }
-            virtual const char *GetType() { return "NasalGarbageCollectionConfiguration"; }
-            virtual bool SetWait(bool wait) {
-                if (wait == CanWait)
-                    return false;
-                CanWait = wait;
-                return true;
-            }
-            virtual bool SetActive(bool active) {
-                if (active == Active)
-                    return false;
-                Active = active;
-                return true;
-            }
-        public:
-            bool CanWait;
-            bool Active;
-        };
-    }
-}
-#endif
--- a/simgear/emesary/test_emesary.cxx
+++ b/simgear/emesary/test_emesary.cxx
@@ -1,130 +0,0 @@
-////////////////////////////////////////////////////////////////////////
-// Test harness for Emesary.
-////////////////////////////////////////////////////////////////////////
-
-#include <simgear_config.h>
-#include <simgear/compiler.h>
-
-#include <iostream>
-
-#include <simgear/threads/SGThread.hxx>
-#include <simgear/emesary/Emesary.hxx>
-
-using std::cout;
-using std::cerr;
-using std::endl;
-
-std::atomic<int> nthread {0};
-std::atomic<int> noperations {0};
-const int MaxIterations = 9999;
-
-class TestThreadNotification : public simgear::Emesary::INotification
-{
-protected:
-    const char *baseValue;
-public:
-    TestThreadNotification(const char *v) : baseValue(v) {}
-
-    virtual const char* GetType () { return baseValue; }
-};
-
-class TestThreadRecipient : public simgear::Emesary::IReceiver
-{
-public:
-    TestThreadRecipient() : receiveCount(0)
-    {
-    }
-
-    std::atomic<int> receiveCount;
-
-    virtual simgear::Emesary::ReceiptStatus Receive(simgear::Emesary::INotification &n)
-    {
-        if (n.GetType() == (const char*)this)
-        {
-            // Unused: TestThreadNotification *tn = dynamic_cast<TestThreadNotification *>(&n);
-            receiveCount++;
-
-            TestThreadNotification onwardNotification("AL");
-            simgear::Emesary::GlobalTransmitter::instance()->NotifyAll(onwardNotification);
-            
-            return simgear::Emesary::ReceiptStatusOK;
-        }
-
-        return simgear::Emesary::ReceiptStatusOK;
-    }
-};
-
-class EmesaryTestThread : public SGThread
-{
-protected:
-    virtual void run() {
-        int threadId = nthread.fetch_add(1);
-
-        //System.Threading.Interlocked.Increment(ref nthread);
-        //var rng = new Random();
-        TestThreadRecipient r;
-        char temp[100];
-        sprintf(temp, "Notif %d", threadId);
-        printf("starting thread %s\n", temp);
-        TestThreadNotification tn((const char*)&r);
-        for (int i = 0; i < MaxIterations; i++)
-        {
-            simgear::Emesary::GlobalTransmitter::instance()->Register(r);
-            simgear::Emesary::GlobalTransmitter::instance()->NotifyAll(tn);
-            simgear::Emesary::GlobalTransmitter::instance()->DeRegister(r);
-            //System.Threading.Thread.Sleep(rng.Next(MaxSleep));
-            noperations++;
-        }
-        printf("%s invocations %d\n", temp, (int)r.receiveCount);
-        printf("finish thread %s\n", temp);
-    }
-};
-
-class EmesaryTest
-{
-public:
-
-    void Emesary_MultiThreadTransmitterTest()
-    {
-        int num_threads = 12;
-        std::list<EmesaryTestThread*> threads;
-
-        for (int i = 0; i < num_threads; i++)
-        {
-            EmesaryTestThread *thread = new EmesaryTestThread();
-            threads.push_back(thread);
-            thread->start();
-        }
-        for (std::list<EmesaryTestThread*>::iterator i = threads.begin(); i != threads.end(); i++)
-        {
-            (*i)->join();
-        }
-    }
-};
-
-void testEmesaryThreaded()
-{
-    TestThreadRecipient r;
-    TestThreadNotification tn((const char*)&r);
-    simgear::Emesary::GlobalTransmitter::instance()->Register(r);
-    for (int i = 0; i < MaxIterations*MaxIterations; i++)
-    {
-        simgear::Emesary::GlobalTransmitter::instance()->NotifyAll(tn);
-        //System.Threading.Thread.Sleep(rng.Next(MaxSleep));
-        noperations++;
-    }
-    simgear::Emesary::GlobalTransmitter::instance()->DeRegister(r);
-    printf("invocations %d\n", simgear::Emesary::GlobalTransmitter::instance()->SentMessageCount());
-
-    EmesaryTest t;
-    t.Emesary_MultiThreadTransmitterTest();
-}
-
-
-int main(int ac, char ** av)
-{
-    testEmesaryThreaded();
-
-    std::cout << "all tests passed" << std::endl;
-    return 0;
-}
--- a/simgear/environment/metar.cxx
+++ b/simgear/environment/metar.cxx
@@ -38,12 +38,9 @@
 #  include <simgear_config.h>
 #endif

-#include <iomanip>
 #include <string>
 #include <time.h>
 #include <cstring>
-#include <ostream>
-#include <sstream>

 #include <simgear/debug/logstream.hxx>
 #include <simgear/structure/exception.hxx>
@@ -158,320 +155,6 @@ SGMetar::~SGMetar()
 }


-static const char *azimuthName(double d)
-{
-	const char *dir[] = {
-		"N", "NNE", "NE", "ENE",
-		"E", "ESE", "SE", "SSE",
-		"S", "SSW", "SW", "WSW",
-		"W", "WNW", "NW", "NNW"
-	};
-	d += 11.25;
-	while (d < 0)
-		d += 360;
-	while (d >= 360)
-		d -= 360;
-	return dir[int(d / 22.5)];
-}
-
-
-// round double to 10^g
-static double rnd(double r, int g = 0)
-{
-	double f = pow(10.0, g);
-	return f * floor(r / f + 0.5);
-}
-
-
-/* A manipulator that can use spaces to emulate tab characters. */
-struct Tab
-{
-    /* If <stops> is 0, we simply insert tab characters. Otherwise we insert
-    spaces to align with the next column at multiple of <stops>. */
-    explicit Tab(int stops)
-    :
-    _stops(stops)
-    {}
-    int _stops;
-};
-
-std::ostream& operator << (std::ostream& out, const Tab& t)
-{
-    if (t._stops == 0) {
-        return out << '\t';
-    }
-    
-    std::ostringstream& out2 = *(std::ostringstream*) &out;
-    std::string s = out2.str();
-    
-    if (t._stops < 0) {
-        if (!s.size() || s[s.size()-1] != ' ') {
-            out << ' ';
-        }
-        return out;
-    }
-    
-    auto nl = s.rfind('\n');
-    if (nl < 0) nl = 0;
-    int column = 0;
-    for (auto i = nl+1; i != s.size(); ++i) {
-        if (s[i] == '\t')
-            column = (column + t._stops) / t._stops * t._stops;
-        else
-            column += 1;
-    }
-    int column2 = (column + t._stops) / t._stops * t._stops;
-    for (int i=column; i<column2; ++i) {
-        out << ' ';
-    }
-    return out;
-}
-
-/* Manipulator for SGMetarVisibility using a Tab. */
-struct SGMetarVisibilityManip
-{
-    explicit SGMetarVisibilityManip(const SGMetarVisibility& v, const Tab& tab)
-    :
-    _v(v),
-    _tab(tab)
-    {}
-    const SGMetarVisibility&    _v;
-    const Tab&                  _tab;
-};
-
-std::ostream& operator << (std::ostream& out, const SGMetarVisibilityManip& v)
-{
-	int m = v._v.getModifier();
-	const char *mod;
-	if (m == SGMetarVisibility::GREATER_THAN)
-		mod = ">=";
-	else if (m == SGMetarVisibility::LESS_THAN)
-		mod = "<";
-	else
-		mod = "";
-	out << mod;
-
-	double dist = rnd(v._v.getVisibility_m(), 1);
-	if (dist < 1000.0)
-		out << rnd(dist, 1) << " m";
-	else
-		out << rnd(dist / 1000.0, -1) << " km";
-
-	const char *dir = "";
-	int i;
-	if ((i = v._v.getDirection()) != -1) {
-		dir = azimuthName(i);
-		out << " " << dir;
-	}
-        out << v._tab << v._tab << v._tab << v._tab << v._tab;
-        out << mod << rnd(v._v.getVisibility_sm(), -1) << " US-miles " << dir;
-        return out;
-}
-
-
-std::string SGMetar::getDescription(int tabstops) const
-{
-        std::ostringstream  out;
-	const char *s;
-	char buf[256];
-	double d;
-	int i, lineno;
-        Tab tab(tabstops);
-        
-	if ((i = getReportType()) == SGMetar::AUTO)
-		out << "(METAR automatically generated)\n";
-	else if (i == SGMetar::COR)
-		out << "(METAR manually corrected)\n";
-	else if (i == SGMetar::RTD)
-		out << "(METAR routine delayed)\n";
-        
-	out << "Airport-Id:" << tab << tab << getId() << "\n";
-
-	// date/time
-	int year = getYear();
-	int month = getMonth();
-	out << "Report time:" << tab << tab << year << '/' << month << '/' << getDay();
-	out << ' ' << getHour() << ':';
-	out << std::setw(2) << std::setfill('0') << getMinute() << " UTC\n";
-
-
-	// visibility
-	SGMetarVisibility minvis = getMinVisibility();
-	SGMetarVisibility maxvis = getMaxVisibility();
-	double min = minvis.getVisibility_m();
-	double max = maxvis.getVisibility_m();
-	if (min != NaN) {
-		if (max != NaN) {
-			out << "min. Visibility:" << tab << SGMetarVisibilityManip(minvis, tab) << "\n";
-			out << "max. Visibility:" << tab << SGMetarVisibilityManip(maxvis, tab) << "\n";
-		} else {
-			out << "Visibility:" << tab << tab << SGMetarVisibilityManip(minvis, tab) << "\n";
-                }
-	}
-
-
-	// directed visibility
-	const SGMetarVisibility *dirvis = getDirVisibility();
-	for (i = 0; i < 8; i++, dirvis++)
-		if (dirvis->getVisibility_m() != NaN)
-			out << tab << tab << tab << SGMetarVisibilityManip(*dirvis, tab) << "\n";
-
-
-	// vertical visibility
-	SGMetarVisibility vertvis = getVertVisibility();
-	if ((d = vertvis.getVisibility_ft()) != NaN)
-		out << "Vert. visibility:" << tab << SGMetarVisibilityManip(vertvis, tab) << "\n";
-	else if (vertvis.getModifier() == SGMetarVisibility::NOGO)
-		out << "Vert. visibility:" << tab << "impossible to determine" << "\n";
-
-
-	// wind
-	d = getWindSpeed_kmh();
-	out << "Wind:" << tab << tab << tab;
-	if (d < .1)
-		out << "none" << "\n";
-	else {
-		if ((i = getWindDir()) == -1)
-			out << "from variable directions";
-		else
-			out << "from the " << azimuthName(i) << " (" << i << " deg)";
-		out << " at " << rnd(d, -1) << " km/h";
-
-		out << tab << tab << rnd(getWindSpeed_kt(), -1) << " kt";
-		out << " = " << rnd(getWindSpeed_mph(), -1) << " mph";
-		out << " = " << rnd(getWindSpeed_mps(), -1) << " m/s";
-		out << "\n";
-
-		d = getGustSpeed_kmh();
-                if (d != NaN && d != 0) {
-			out << tab << tab << tab << "with gusts at " << rnd(d, -1) << " km/h";
-			out << tab << tab << tab << rnd(getGustSpeed_kt(), -1) << " kt";
-			out << " = " << rnd(getGustSpeed_mph(), -1) << " mph";
-			out << " = " << rnd(getGustSpeed_mps(), -1) << " m/s";
-			out << "\n";
-		}
-
-		int from = getWindRangeFrom();
-		int to = getWindRangeTo();
-		if (from != to) {
-			out << tab << tab << tab << "variable from " << azimuthName(from);
-			out << " to " << azimuthName(to);
-			out << " (" << from << "deg --" << to << " deg)" << "\n";
-		}
-	}
-
-
-	// temperature/humidity/air pressure
-	if ((d = getTemperature_C()) != NaN) {
-		out << "Temperature:" << tab << tab << d << " C" << tab << tab << tab << tab << tab;
-		out << rnd(getTemperature_F(), -1) << " F" << "\n";
-
-		if ((d = getDewpoint_C()) != NaN) {
-			out << "Dewpoint:" << tab << tab << d << " C" << tab << tab << tab << tab << tab;
-			out << rnd(getDewpoint_F(), -1) << " F"  << "\n";
-			out << "Rel. Humidity: " << tab << tab << rnd(getRelHumidity()) << " %" << "\n";
-		}
-	}
-	if ((d = getPressure_hPa()) != NaN) {
-		out << "Pressure:" << tab << tab << rnd(d) << " hPa" << tab << tab << tab << tab;
-		out << rnd(getPressure_inHg(), -2) << " in. Hg" << "\n";
-	}
-
-
-	// weather phenomena
-	vector<string> wv = getWeather();
-	vector<string>::iterator weather;
-	for (i = 0, weather = wv.begin(); weather != wv.end(); weather++, i++) {
-		out << (i ? ", " : "Weather:") << tab << tab << weather->c_str();
-	}
-	if (i)
-		out << "\n";
-
-
-	// cloud layers
-	const char *coverage_string[5] = {
-		"clear skies", "few clouds", "scattered clouds", "broken clouds", "sky overcast"
-	};
-	vector<SGMetarCloud> cv = getClouds();
-	vector<SGMetarCloud>::iterator cloud;
-	for (lineno = 0, cloud = cv.begin(); cloud != cv.end(); cloud++, lineno++) {
-                if (lineno) out << tab << tab << tab;
-                else    out << "Sky condition:" << tab << tab;
-
-		if ((i = cloud->getCoverage()) != -1)
-			out << coverage_string[i];
-		if ((d = cloud->getAltitude_ft()) != NaN)
-			out << " at " << rnd(d, 1) << " ft";
-		if ((s = cloud->getTypeLongString()))
-			out << " (" << s << ')';
-		if (d != NaN)
-			out << tab << tab << tab << rnd(cloud->getAltitude_m(), 1) << " m";
-		out << "\n";
-	}
-
-
-	// runways
-	map<string, SGMetarRunway> rm = getRunways();
-	map<string, SGMetarRunway>::iterator runway;
-	for (runway = rm.begin(); runway != rm.end(); runway++) {
-		lineno = 0;
-		if (!strcmp(runway->first.c_str(), "ALL"))
-			out << "All runways:" << tab << tab;
-		else
-			out << "Runway " << runway->first << ":" << tab << tab;
-		SGMetarRunway rwy = runway->second;
-
-		// assemble surface string
-		vector<string> surface;
-		if ((s = rwy.getDepositString()) && strlen(s))
-			surface.push_back(s);
-		if ((s = rwy.getExtentString()) && strlen(s))
-			surface.push_back(s);
-		if ((d = rwy.getDepth()) != NaN) {
-			sprintf(buf, "%.1lf mm", d * 1000.0);
-			surface.push_back(buf);
-		}
-		if ((s = rwy.getFrictionString()) && strlen(s))
-			surface.push_back(s);
-		if ((d = rwy.getFriction()) != NaN) {
-			sprintf(buf, "friction: %.2lf", d);
-			surface.push_back(buf);
-		}
-
-		if (! surface.empty()) {
-			vector<string>::iterator rwysurf = surface.begin();
-			for (i = 0; rwysurf != surface.end(); rwysurf++, i++) {
-				if (i)
-					out << ", ";
-				out << *rwysurf;
-			}
-			lineno++;
-		}
-
-		// assemble visibility string
-		SGMetarVisibility minvis = rwy.getMinVisibility();
-		SGMetarVisibility maxvis = rwy.getMaxVisibility();
-		if ((d = minvis.getVisibility_m()) != NaN) {
-			if (lineno++)
-				out << "\n" << tab << tab << tab;
-			out << SGMetarVisibilityManip(minvis, tab);
-		}
-		if (maxvis.getVisibility_m() != d) {
-			out << "\n" << tab << tab << tab << SGMetarVisibilityManip(maxvis, tab) << "\n";
-			lineno++;
-		}
-
-		if (rwy.getWindShear()) {
-			if (lineno++)
-				out << "\n" << tab << tab << tab;
-			out << "critical wind shear" << "\n";
-		}
-		out << "\n";
-	}
-	out << "\n";
-        return out.str();
-}
-
 void SGMetar::useCurrentDate()
 {
 	struct tm now;
@@ -631,15 +314,11 @@ bool SGMetar::scanWind()
 	int dir;
 	if (!strncmp(m, "VRB", 3))
 		m += 3, dir = -1;
-	else if (!strncmp(m, "///", 3))	// direction not measurable
-		m += 3, dir = -1;
 	else if (!scanNumber(&m, &dir, 3))
 		return false;

 	int i;
-	if (!strncmp(m, "//", 2))	// speed not measurable
-		m += 2, i = -1;
-	else if (!scanNumber(&m, &i, 2, 3))
+	if (!scanNumber(&m, &i, 2, 3))
 		return false;
 	double speed = i;

@@ -659,8 +338,6 @@ bool SGMetar::scanWind()
 		m += 3, factor = SG_KMH_TO_MPS;
 	else if (!strncmp(m, "MPS", 3))
 		m += 3, factor = 1.0;
-	else if (!strncmp(m, " ", 1))		// default to Knots
-		factor = SG_KT_TO_MPS;
 	else
 		return false;
 	if (!scanBoundary(&m))
@@ -958,8 +635,6 @@ bool SGMetar::scanWeather()
 		weather += string(a->text) + " ";
 		if (!strcmp(a->id, "RA"))
 			_rain = w.intensity;
-		else if (!strcmp(a->id, "DZ"))
-			_rain = LIGHT;
 		else if (!strcmp(a->id, "HA"))
 			_hail = w.intensity;
 		else if (!strcmp(a->id, "SN"))
--- a/simgear/environment/metar.hxx
+++ b/simgear/environment/metar.hxx
@@ -235,11 +235,6 @@ public:
 	inline const std::vector<std::string>& getWeather()		const	{ return _weather; }
 	inline const std::vector<struct Weather> getWeather2()	const   { return _weather2; }

-        /* Returns human-readable description. If tabtops is 0, we use tab
-        characters. If +ve we use spaces to pad to multiple of <tabstops>. If
-        -1 all sequences of tabs are represented by a single space. */
-        std::string     getDescription(int tabstops)   const;
-
 protected:
 	std::string	_url;
 	int	_grpcount;
--- a/simgear/environment/precipitation.cxx
+++ b/simgear/environment/precipitation.cxx
@@ -44,10 +44,6 @@ SGPrecipitation::SGPrecipitation() :
 void SGPrecipitation::setEnabled( bool value )
 {
    _enabled = value;
-    if (!_enabled) {
-        _precipitationEffect->snow(0);
-        _precipitationEffect->rain(0);
-    }
 }

 void SGPrecipitation::setDropletExternal( bool value )
@@ -68,9 +64,6 @@ bool SGPrecipitation::getEnabled() const
 */
 osg::Group* SGPrecipitation::build(void)
 {
-    if (!_enabled) 
-        return nullptr;
-
    osg::ref_ptr<osg::Group> group = new osg::Group;

    _precipitationEffect->snow(0);	
@@ -234,9 +227,6 @@ void SGPrecipitation::setWindProperty(double heading, double speed)
 */
 bool SGPrecipitation::update(void)
 {
-    if (!_enabled)
-        return false;
-
    if (this->_freeze) {
        if (this->_rain_intensity > 0) {
 		this->_snow_intensity = this->_rain_intensity;
--- a/simgear/environment/test_metar.cxx
+++ b/simgear/environment/test_metar.cxx
@@ -76,29 +76,12 @@ void test_sensor_failure_cloud()
    SG_CHECK_EQUAL_EP2(m1.getPressure_hPa(), 1025, TEST_EPSILON);
 }

-void test_sensor_failure_wind()
-{
-    SGMetar m1("2020/10/23 16:55 LIVD 231655Z /////KT 9999 OVC025 10/08 Q1020 RMK OVC VIS MIN 9999 BLU");
-    SG_CHECK_EQUAL(m1.getWindDir(), -1);
-    SG_CHECK_EQUAL_EP2(m1.getWindSpeed_kt(), -1, TEST_EPSILON);
-}
-
-void test_wind_unit_not_specified()
-{
-    SGMetar m1("2020/10/23 11:58 KLSV 231158Z 05010G14 10SM CLR 16/M04 A2992 RMK SLPNO WND DATA ESTMD ALSTG/SLP ESTMD 10320 20124 5//// $");
-    SG_CHECK_EQUAL(m1.getWindDir(), 50);
-    SG_CHECK_EQUAL_EP2(m1.getWindSpeed_kt(), 10.0, TEST_EPSILON);
-    SG_CHECK_EQUAL_EP2(m1.getGustSpeed_kt(), 14.0, TEST_EPSILON);
-}
-
 int main(int argc, char* argv[])
 {
    try {
        test_basic();
        test_sensor_failure_weather();
        test_sensor_failure_cloud();
-        test_sensor_failure_wind();
-        test_wind_unit_not_specified();
    } catch (sg_exception& e) {
        cerr << "got exception:" << e.getMessage() << endl;
        return -1;
--- a/simgear/environment/visual_enviro.cxx
+++ b/simgear/environment/visual_enviro.cxx
@@ -191,11 +191,52 @@ SGEnviro::~SGEnviro(void) {

  // OSGFIXME
  return;
+	list_of_lightning::iterator iLightning;
+	for( iLightning = lightnings.begin() ; iLightning != lightnings.end() ; ++iLightning ) {
+		delete (*iLightning);
+	}
+	lightnings.clear();
 }

 void SGEnviro::startOfFrame( SGVec3f p, SGVec3f up, double lon, double lat, double alt, double delta_time) {
  // OSGFIXME
  return;
+	view_in_cloud = false;
+	// ask the impostor cache to do some cleanup
+	last_cloud_turbulence = cloud_turbulence;
+	cloud_turbulence = 0.0;
+	elapsed_time += delta_time;
+	min_time_before_lt -= delta_time;
+	dt = delta_time;
+#if 0
+	sgMat4 T1, LON, LAT;
+    sgVec3 axis;
+
+    sgMakeTransMat4( T1, p );
+
+    sgSetVec3( axis, 0.0, 0.0, 1.0 );
+    sgMakeRotMat4( LON, lon, axis );
+
+    sgSetVec3( axis, 0.0, 1.0, 0.0 );
+    sgMakeRotMat4( LAT, 90.0 - lat, axis );
+
+    sgMat4 TRANSFORM;
+
+    sgCopyMat4( TRANSFORM, T1 );
+    sgPreMultMat4( TRANSFORM, LON );
+    sgPreMultMat4( TRANSFORM, LAT );
+
+    sgCoord pos;
+    sgSetCoord( &pos, TRANSFORM );
+
+	sgMakeCoordMat4( transform, &pos );
+  #endif
+    last_lon = lon;
+    last_lat = lat;
+	last_alt = alt;
+
+	radarEcho.clear();
+	precipitation_max_alt = 400.0;
 }

 void SGEnviro::endOfFrame(void) {
@@ -250,6 +291,10 @@ void SGEnviro::set_lightning_enable_state(bool enable) {
 void SGEnviro::setLight(SGVec4f adj_fog_color) {
  // OSGFIXME
  return;
+	 fog_color = adj_fog_color;
+	if( false ) {
+	//    ssgGetLight( 0 ) -> setColour( GL_DIFFUSE, l->scene_diffuse() );
+	}
 }
 #if 0
 void SGEnviro::callback_cloud(float heading, float alt, float radius, int family, float dist, int cloudId) {
@@ -386,6 +431,9 @@ void SGEnviro::set_sampleGroup(SGSampleGroup *sgr) {
 void SGEnviro::drawPrecipitation(double rain_norm, double snow_norm, double hail_norm, double pitch, double roll, double heading, double hspeed) {
  // OSGFIXME
  return;
+	if( precipitation_enable_state && rain_norm > 0.0)
+	  if( precipitation_max_alt >= last_alt )
+		drawRain(pitch, roll, heading, hspeed, rain_norm);
 }


@@ -423,6 +471,10 @@ void SGLightning::lt_Render(void) {
 void SGEnviro::addLightning(double lon, double lat, double alt) {
  // OSGFIXME
  return;
+	if( lightnings.size() > 10)
+		return;
+	SGLightning *lt= new SGLightning(lon, lat, alt);
+	lightnings.push_back(lt);
 }

 void SGEnviro::drawLightning(void) {
--- a/simgear/ephemeris/ephemeris.cxx
+++ b/simgear/ephemeris/ephemeris.cxx
@@ -31,7 +31,7 @@


 // Constructor
-SGEphemeris::SGEphemeris( const SGPath& path ) {
+SGEphemeris::SGEphemeris( const std::string &path ) {
    our_sun = new Star;
    moon = new MoonPos;
    mercury = new Mercury;
@@ -44,7 +44,7 @@ SGEphemeris::SGEphemeris( const SGPath& path ) {
    nplanets = 7;
    for ( int i = 0; i < nplanets; ++i )
      planets[i] = SGVec3d::zeros();
-    stars = new SGStarData(path);
+    stars = new SGStarData( SGPath(path) );
 }


--- a/simgear/ephemeris/ephemeris.hxx
+++ b/simgear/ephemeris/ephemeris.hxx
@@ -97,7 +97,7 @@ public:
     * calling the constructor you need to provide a path pointing to
     * your star database file.
     * @param path path to your star database */
-    SGEphemeris( const SGPath &path );
+    SGEphemeris( const std::string &path );

    /** Destructor */
    ~SGEphemeris( void );
--- a/simgear/hla/RTIFederateFactoryRegistry.cxx
+++ b/simgear/hla/RTIFederateFactoryRegistry.cxx
@@ -19,13 +19,11 @@
 #  include <simgear_config.h>
 #endif

-#include <mutex>
-
 #include <simgear/compiler.h>

 #include "RTIFederateFactoryRegistry.hxx"

-#include "simgear/threads/SGThread.hxx"
+#include "simgear/threads/SGGuard.hxx"
 #include "RTIFederate.hxx"

 namespace simgear {
@@ -41,7 +39,7 @@ RTIFederateFactoryRegistry::~RTIFederateFactoryRegistry()
 SGSharedPtr<RTIFederate>
 RTIFederateFactoryRegistry::create(const std::string& name, const std::list<std::string>& stringList) const
 {
-    std::lock_guard<std::mutex> guard(_mutex);
+    SGGuard<SGMutex> guard(_mutex);
    for (FederateFactoryList::const_iterator i = _federateFactoryList.begin(); i != _federateFactoryList.end(); ++i) {
        SGSharedPtr<RTIFederate> federate = (*i)->create(name, stringList);
        if (!federate.valid())
@@ -54,7 +52,7 @@ RTIFederateFactoryRegistry::create(const std::string& name, const std::list<std:
 void
 RTIFederateFactoryRegistry::registerFactory(RTIFederateFactory* factory)
 {
-    std::lock_guard<std::mutex> guard(_mutex);
+    SGGuard<SGMutex> guard(_mutex);
    _federateFactoryList.push_back(factory);
 }

--- a/simgear/io/CMakeLists.txt
+++ b/simgear/io/CMakeLists.txt
@@ -35,12 +35,10 @@ set(SOURCES
    sg_socket.cxx
    sg_socket_udp.cxx
    HTTPClient.cxx
-    HTTPTestApi_private.hxx
    HTTPFileRequest.cxx
    HTTPMemoryRequest.cxx
    HTTPRequest.cxx
    HTTPRepository.cxx
-    HTTPRepository_private.hxx
    untar.cxx
    )

@@ -83,7 +81,6 @@ add_test(binobj ${EXECUTABLE_OUTPUT_PATH}/test_binobj)

 add_executable(test_repository test_repository.cxx)
 target_link_libraries(test_repository ${TEST_LIBS})
-target_compile_definitions(test_repository PUBLIC BUILDING_TESTSUITE)
 add_test(http_repository ${EXECUTABLE_OUTPUT_PATH}/test_repository)

 add_executable(test_untar test_untar.cxx)
--- a/simgear/io/DNSClient.cxx
+++ b/simgear/io/DNSClient.cxx
@@ -156,13 +156,8 @@ static void dnscbTXT(struct dns_ctx *ctx, struct dns_rr_txt *result, void *data)
        r->ttl = result->dnstxt_ttl;
        for (int i = 0; i < result->dnstxt_nrr; i++) {
          //TODO: interprete the .len field of dnstxt_txt?
-          auto rawTxt = reinterpret_cast<char*>(result->dnstxt_txt[i].txt);
-          if (!rawTxt) {
-              continue;
-          }
-
-          const string txt{rawTxt};
-          r->entries.push_back(txt);
+          string txt = string((char*)result->dnstxt_txt[i].txt);
+          r->entries.push_back( txt );
          string_list tokens = simgear::strutils::split( txt, "=", 1 );
          if( tokens.size() == 2 ) {
            r->attributes[tokens[0]] = tokens[1];
--- a/simgear/io/HTTPClient.cxx
+++ b/simgear/io/HTTPClient.cxx
@@ -33,10 +33,13 @@
 #include <errno.h>
 #include <map>
 #include <stdexcept>
-#include <mutex>
+
+#include <boost/foreach.hpp>
+#include <boost/algorithm/string/case_conv.hpp>

 #include <simgear/simgear_config.h>

+#include <curl/multi.h>

 #include <simgear/io/sg_netChat.hxx>

@@ -46,9 +49,6 @@
 #include <simgear/timing/timestamp.hxx>
 #include <simgear/structure/exception.hxx>

-#include "HTTPClient_private.hxx"
-#include "HTTPTestApi_private.hxx"
-
 #if defined( HAVE_VERSION_H ) && HAVE_VERSION_H
 #include "version.h"
 #else
@@ -66,20 +66,48 @@ namespace HTTP
 extern const int DEFAULT_HTTP_PORT = 80;
 const char* CONTENT_TYPE_URL_ENCODED = "application/x-www-form-urlencoded";

-void Client::ClientPrivate::createCurlMulti() {
-  curlMulti = curl_multi_init();
-  // see https://curl.haxx.se/libcurl/c/CURLMOPT_PIPELINING.html
-  // we request HTTP 1.1 pipelining
-  curl_multi_setopt(curlMulti, CURLMOPT_PIPELINING, 1 /* aka CURLPIPE_HTTP1 */);
+class Connection;
+typedef std::multimap<std::string, Connection*> ConnectionDict;
+typedef std::list<Request_ptr> RequestList;
+
+class Client::ClientPrivate
+{
+public:
+    CURLM* curlMulti;
+
+    void createCurlMulti()
+    {
+        curlMulti = curl_multi_init();
+        // see https://curl.haxx.se/libcurl/c/CURLMOPT_PIPELINING.html
+        // we request HTTP 1.1 pipelining
+        curl_multi_setopt(curlMulti, CURLMOPT_PIPELINING, 1 /* aka CURLPIPE_HTTP1 */);
 #if (LIBCURL_VERSION_MINOR >= 30)
-  curl_multi_setopt(curlMulti, CURLMOPT_MAX_TOTAL_CONNECTIONS,
-                    (long)maxConnections);
-  curl_multi_setopt(curlMulti, CURLMOPT_MAX_PIPELINE_LENGTH,
-                    (long)maxPipelineDepth);
-  curl_multi_setopt(curlMulti, CURLMOPT_MAX_HOST_CONNECTIONS,
-                    (long)maxHostConnections);
+        curl_multi_setopt(curlMulti, CURLMOPT_MAX_TOTAL_CONNECTIONS, (long) maxConnections);
+        curl_multi_setopt(curlMulti, CURLMOPT_MAX_PIPELINE_LENGTH,
+                          (long) maxPipelineDepth);
+        curl_multi_setopt(curlMulti, CURLMOPT_MAX_HOST_CONNECTIONS,
+                          (long) maxHostConnections);
 #endif
-}
+    }
+
+    typedef std::map<Request_ptr, CURL*> RequestCurlMap;
+    RequestCurlMap requests;
+
+    std::string userAgent;
+    std::string proxy;
+    int proxyPort;
+    std::string proxyAuth;
+    unsigned int maxConnections;
+    unsigned int maxHostConnections;
+    unsigned int maxPipelineDepth;
+
+    RequestList pendingRequests;
+
+    SGTimeStamp timeTransferSample;
+    unsigned int bytesTransferred;
+    unsigned int lastTransferRate;
+    uint64_t totalBytesDownloaded;
+};

 Client::Client() :
    d(new ClientPrivate)
@@ -94,12 +122,7 @@ Client::Client() :
    d->maxPipelineDepth = 5;
    setUserAgent("SimGear-" SG_STRINGIZE(SIMGEAR_VERSION));

-    d->tlsCertificatePath = SGPath::fromEnv("SIMGEAR_TLS_CERT_PATH");
-
    static bool didInitCurlGlobal = false;
-    static std::mutex initMutex;
-
-    std::lock_guard<std::mutex> g(initMutex);
    if (!didInitCurlGlobal) {
      curl_global_init(CURL_GLOBAL_ALL);
      didInitCurlGlobal = true;
@@ -137,14 +160,6 @@ void Client::setMaxPipelineDepth(unsigned int depth)
 #endif
 }

-void Client::reset()
-{
-    curl_multi_cleanup(d->curlMulti);
-    d.reset(new ClientPrivate);
-    d->tlsCertificatePath = SGPath::fromEnv("SIMGEAR_TLS_CERT_PATH");
-    d->createCurlMulti();
-}
-
 void Client::update(int waitTimeout)
 {
    if (d->requests.empty()) {
@@ -155,22 +170,32 @@ void Client::update(int waitTimeout)
    }

    int remainingActive, messagesInQueue;
+#if defined(SG_MAC)
+    // Mac 10.8 libCurl lacks this, let's keep compat for now
+    fd_set curlReadFDs, curlWriteFDs, curlErrorFDs;
+    int maxFD;
+    curl_multi_fdset(d->curlMulti,
+                     &curlReadFDs,
+                     &curlWriteFDs,
+                     &curlErrorFDs,
+                     &maxFD);
+    
+    struct timeval timeout;
+    long t;
+    
+    curl_multi_timeout(d->curlMulti, &t);
+    if ((t < 0) || (t > waitTimeout)) {
+        t = waitTimeout;
+    }
+    
+    timeout.tv_sec = t / 1000;
+    timeout.tv_usec = (t % 1000) * 1000;
+    ::select(maxFD, &curlReadFDs, &curlWriteFDs, &curlErrorFDs, &timeout);
+#else
    int numFds;
-    CURLMcode mc = curl_multi_wait(d->curlMulti, NULL, 0, waitTimeout, &numFds);
-    if (mc != CURLM_OK) {
-        SG_LOG(SG_IO, SG_WARN, "curl_multi_wait failed:" << curl_multi_strerror(mc));
-        return;
-    }
-
-    mc = curl_multi_perform(d->curlMulti, &remainingActive);
-    if (mc == CURLM_CALL_MULTI_PERFORM) {
-        // we could loop here, but don't want to get blocked
-        // also this shouldn't  ocurr in any modern libCurl
-        curl_multi_perform(d->curlMulti, &remainingActive);
-    } else if (mc != CURLM_OK) {
-        SG_LOG(SG_IO, SG_WARN, "curl_multi_perform failed:" << curl_multi_strerror(mc));
-        return;
-    }
+    curl_multi_wait(d->curlMulti, NULL, 0, waitTimeout, &numFds);
+#endif
+    curl_multi_perform(d->curlMulti, &remainingActive);

    CURLMsg* msg;
    while ((msg = curl_multi_info_read(d->curlMulti, &messagesInQueue))) {
@@ -195,23 +220,12 @@ void Client::update(int waitTimeout)
          assert(it->second == e);
          d->requests.erase(it);

-          bool doProcess = true;
-          if (d->testsuiteResponseDoneCallback) {
-            doProcess =
-                !d->testsuiteResponseDoneCallback(msg->data.result, req);
-          }
-
-          if (doProcess) {
-            if (msg->data.result == 0) {
-              req->responseComplete();
-            } else {
-              SG_LOG(SG_IO, SG_WARN,
-                     "CURL Result:" << msg->data.result << " "
-                                    << curl_easy_strerror(msg->data.result));
-              req->setFailure(msg->data.result,
-                              curl_easy_strerror(msg->data.result));
-            }
-          }
+        if (msg->data.result == 0) {
+          req->responseComplete();
+        } else {
+          SG_LOG(SG_IO, SG_WARN, "CURL Result:" << msg->data.result << " " << curl_easy_strerror(msg->data.result));
+          req->setFailure(msg->data.result, curl_easy_strerror(msg->data.result));
+        }

        curl_multi_remove_handle(d->curlMulti, e);
        curl_easy_cleanup(e);
@@ -256,25 +270,11 @@ void Client::makeRequest(const Request_ptr& r)
    curl_easy_setopt(curlRequest, CURLOPT_HEADERFUNCTION, requestHeaderCallback);
    curl_easy_setopt(curlRequest, CURLOPT_HEADERDATA, r.get());

-#if !defined(CURL_MAX_READ_SIZE)
-	const int CURL_MAX_READ_SIZE = 512 * 1024;
-#endif
-
-    curl_easy_setopt(curlRequest, CURLOPT_BUFFERSIZE, CURL_MAX_READ_SIZE);
    curl_easy_setopt(curlRequest, CURLOPT_USERAGENT, d->userAgent.c_str());
    curl_easy_setopt(curlRequest, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);

-    if (sglog().would_log(SG_TERRASYNC, SG_DEBUG)) {
-        curl_easy_setopt(curlRequest, CURLOPT_VERBOSE, 1);
-    }
-
    curl_easy_setopt(curlRequest, CURLOPT_FOLLOWLOCATION, 1);

-    if (!d->tlsCertificatePath.isNull()) {
-        const auto utf8 = d->tlsCertificatePath.utf8Str();
-        curl_easy_setopt(curlRequest, CURLOPT_CAINFO, utf8.c_str());
-    }
-
    if (!d->proxy.empty()) {
      curl_easy_setopt(curlRequest, CURLOPT_PROXY, d->proxy.c_str());
      curl_easy_setopt(curlRequest, CURLOPT_PROXYPORT, d->proxyPort);
@@ -285,7 +285,7 @@ void Client::makeRequest(const Request_ptr& r)
      }
    }

-    const std::string method = strutils::lowercase (r->method());
+    std::string method = boost::to_lower_copy(r->method());
    if (method == "get") {
      curl_easy_setopt(curlRequest, CURLOPT_HTTPGET, 1);
    } else if (method == "put") {
@@ -476,7 +476,7 @@ bool isRedirectStatus(int code)
 {
    return ((code >= 300) && (code < 400));
 }
-
+    
 size_t Client::requestHeaderCallback(char *rawBuffer, size_t size, size_t nitems, void *userdata)
 {
  size_t byteSize = size * nitems;
@@ -491,7 +491,7 @@ size_t Client::requestHeaderCallback(char *rawBuffer, size_t size, size_t nitems
          return byteSize;
      }
  }
-
+    
  if (req->readyState() == HTTP::Request::OPENED) {
    req->responseStart(h);
    return byteSize;
@@ -518,8 +518,8 @@ size_t Client::requestHeaderCallback(char *rawBuffer, size_t size, size_t nitems
      return byteSize;
  }

-  const std::string key = strutils::simplify(h.substr(0, colonPos));
-  const std::string lkey = strutils::lowercase (key);
+  std::string key = strutils::simplify(h.substr(0, colonPos));
+  std::string lkey = boost::to_lower_copy(key);
  std::string value = strutils::strip(h.substr(colonPos + 1));

  req->responseHeader(lkey, value);
@@ -542,17 +542,6 @@ void Client::clearAllConnections()
    d->createCurlMulti();
 }

-/////////////////////////////////////////////////////////////////////
-
-void TestApi::setResponseDoneCallback(Client *cl, ResponseDoneCallback cb) {
-  cl->d->testsuiteResponseDoneCallback = cb;
-}
-
-void TestApi::markRequestAsFailed(Request_ptr req, int curlCode,
-                                  const std::string &message) {
-  req->setFailure(curlCode, message);
-}
-
 } // of namespace HTTP

 } // of namespace simgear
--- a/simgear/io/HTTPClient.hxx
+++ b/simgear/io/HTTPClient.hxx
@@ -24,8 +24,7 @@
 #ifndef SG_HTTP_CLIENT_HXX
 #define SG_HTTP_CLIENT_HXX

-#include <functional>
-#include <memory>   // for std::unique_ptr
+#include <memory> // for std::unique_ptr
 #include <stdint.h> // for uint_64t

 #include <simgear/io/HTTPFileRequest.hxx>
@@ -48,8 +47,6 @@ public:

    void update(int waitTimeout = 0);

-    void reset();
-
    void makeRequest(const Request_ptr& r);

    void cancelRequest(const Request_ptr& r, std::string reason = std::string());
@@ -126,7 +123,6 @@ private:

    friend class Connection;
    friend class Request;
-    friend class TestApi;

    class ClientPrivate;
    std::unique_ptr<ClientPrivate> d;
--- a/simgear/io/HTTPClient_private.hxx
+++ b/simgear/io/HTTPClient_private.hxx
@@ -1,68 +0,0 @@
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library 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
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
-
-#pragma once
-
-#include <list>
-#include <map>
-
-#include "HTTPClient.hxx"
-#include "HTTPRequest.hxx"
-
-#include <simgear/timing/timestamp.hxx>
-
-#include <curl/multi.h>
-
-namespace simgear {
-namespace HTTP {
-
-typedef std::list<Request_ptr> RequestList;
-
-using ResponseDoneCallback =
-    std::function<bool(int curlResult, Request_ptr req)>;
-
-class Client::ClientPrivate {
-public:
-  CURLM *curlMulti;
-
-  void createCurlMulti();
-
-  typedef std::map<Request_ptr, CURL *> RequestCurlMap;
-  RequestCurlMap requests;
-
-  std::string userAgent;
-  std::string proxy;
-  int proxyPort;
-  std::string proxyAuth;
-  unsigned int maxConnections;
-  unsigned int maxHostConnections;
-  unsigned int maxPipelineDepth;
-
-  RequestList pendingRequests;
-
-  SGTimeStamp timeTransferSample;
-  unsigned int bytesTransferred;
-  unsigned int lastTransferRate;
-  uint64_t totalBytesDownloaded;
-
-  SGPath tlsCertificatePath;
-
-  // only used by unit-tests / test-api, but
-  // only costs us a pointe here to declare it.
-  ResponseDoneCallback testsuiteResponseDoneCallback;
-};
-
-} // namespace HTTP
-
-} // namespace simgear
--- a/simgear/io/HTTPRepository.cxx
+++ b/simgear/io/HTTPRepository.cxx
--- a/simgear/io/HTTPRepository.hxx
+++ b/simgear/io/HTTPRepository.hxx
@@ -20,7 +20,6 @@
 #ifndef SG_IO_HTTP_REPOSITORY_HXX
 #define SG_IO_HTTP_REPOSITORY_HXX

-#include <functional>
 #include <memory>

 #include <simgear/misc/sg_path.hxx>
@@ -33,83 +32,49 @@ class HTTPRepoPrivate;
 class HTTPRepository
 {
 public:
-  enum ResultCode {
-    REPO_NO_ERROR = 0,
-    REPO_ERROR_NOT_FOUND,
-    REPO_ERROR_SOCKET,
-    SVN_ERROR_XML,
-    SVN_ERROR_TXDELTA,
-    REPO_ERROR_IO,
-    REPO_ERROR_CHECKSUM,
-    REPO_ERROR_FILE_NOT_FOUND,
-    REPO_ERROR_HTTP,
-    REPO_ERROR_CANCELLED,
-    REPO_PARTIAL_UPDATE ///< repository is working, but file-level failures
-                        ///< occurred
-  };
-
-  HTTPRepository(const SGPath &root, HTTP::Client *cl);
-  virtual ~HTTPRepository();
-
-  virtual SGPath fsBase() const;
-
-  virtual void setBaseUrl(const std::string &url);
-  virtual std::string baseUrl() const;
-
-  virtual HTTP::Client *http() const;
-
-  virtual void update();
-
-  virtual bool isDoingSync() const;
-
-  /**
-        @brief call this periodically to progress non-network tasks
-     */
-  void process();
-
-  virtual ResultCode failure() const;
-
-  virtual size_t bytesToDownload() const;
-
-  virtual size_t bytesDownloaded() const;
-
-  /**
-   * optionally provide the location of an installer copy of this
-   * repository. When a file is missing it will be copied from this tree.
-   */
-  void setInstalledCopyPath(const SGPath &copyPath);
-
-  static std::string resultCodeAsString(ResultCode code);
-
-  enum class SyncAction { Add, Update, Delete, UpToDate };
-
-  enum EntryType { FileType, DirectoryType, TarballType };
-
-  struct SyncItem {
-    const std::string directory; // relative path in the repository
-    const EntryType type;
-    const std::string filename;
-    const SyncAction action;
-    const SGPath pathOnDisk; // path the entry does / will have
-  };
-
-    using SyncPredicate = std::function<bool(const SyncItem &item)>;
-
-    void setFilter(SyncPredicate sp);
-
-    struct Failure {
-      SGPath path;
-      ResultCode error;
+    enum ResultCode {
+        REPO_NO_ERROR = 0,
+        REPO_ERROR_NOT_FOUND,
+        REPO_ERROR_SOCKET,
+        SVN_ERROR_XML,
+        SVN_ERROR_TXDELTA,
+        REPO_ERROR_IO,
+        REPO_ERROR_CHECKSUM,
+        REPO_ERROR_FILE_NOT_FOUND,
+        REPO_ERROR_HTTP,
+        REPO_ERROR_CANCELLED,
+        REPO_PARTIAL_UPDATE
    };

-    using FailureVec = std::vector<Failure>;
+    HTTPRepository(const SGPath& root, HTTP::Client* cl);
+    virtual ~HTTPRepository();
+
+    virtual SGPath fsBase() const;
+
+    virtual void setBaseUrl(const std::string& url);
+    virtual std::string baseUrl() const;
+
+    virtual HTTP::Client* http() const;
+
+    virtual void update();
+
+    virtual bool isDoingSync() const;
+
+    virtual ResultCode failure() const;
+
+    virtual size_t bytesToDownload() const;
+
+    virtual size_t bytesDownloaded() const;

    /**
-     * @brief return file-level failures
+     * optionally provide the location of an installer copy of this
+     * repository. When a file is missing it will be copied from this tree.
     */
-    FailureVec failures() const;
+    void setInstalledCopyPath(const SGPath& copyPath);
+    
+    static std::string resultCodeAsString(ResultCode code);

-  private:
+private:
    bool isBare() const;

    std::unique_ptr<HTTPRepoPrivate> _d;
--- a/simgear/io/HTTPRepository_private.hxx
+++ b/simgear/io/HTTPRepository_private.hxx
@@ -1,126 +0,0 @@
-// HTTPRepository.cxx -- plain HTTP TerraSync remote client
-//
-// Copyright (C) 20126  James Turner <zakalawe@mac.com>
-//
-// 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 2 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, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
-// USA.
-
-#pragma once
-
-#include <deque>
-#include <functional>
-#include <memory>
-#include <string>
-#include <unordered_map>
-
-#include <simgear/io/HTTPClient.hxx>
-#include <simgear/misc/sg_path.hxx>
-
-#include "HTTPRepository.hxx"
-
-namespace simgear {
-
-class HTTPDirectory;
-using HTTPDirectory_ptr = std::unique_ptr<HTTPDirectory>;
-
-class HTTPRepoGetRequest : public HTTP::Request {
-public:
-  HTTPRepoGetRequest(HTTPDirectory *d, const std::string &u)
-      : HTTP::Request(u), _directory(d) {}
-
-  virtual void cancel();
-
-  size_t contentSize() const { return _contentSize; }
-
-  void setContentSize(size_t sz) { _contentSize = sz; }
-
-protected:
-  HTTPDirectory *_directory;
-  size_t _contentSize = 0;
-};
-
-using RepoRequestPtr = SGSharedPtr<HTTPRepoGetRequest>;
-
-class HTTPRepoPrivate {
-public:
-
-
-  HTTPRepository::FailureVec failures;
-  int maxPermittedFailures = 16;
-
-  HTTPRepoPrivate(HTTPRepository *parent)
-      : p(parent), isUpdating(false), status(HTTPRepository::REPO_NO_ERROR),
-        totalDownloaded(0) {
-    ;
-  }
-
-  ~HTTPRepoPrivate();
-
-  HTTPRepository *p; // link back to outer
-  HTTP::Client *http;
-  std::string baseUrl;
-  SGPath basePath;
-  bool isUpdating;
-  HTTPRepository::ResultCode status;
-  HTTPDirectory_ptr rootDir;
-  size_t totalDownloaded;
-  HTTPRepository::SyncPredicate syncPredicate;
-
-  HTTP::Request_ptr updateFile(HTTPDirectory *dir, const std::string &name,
-                               size_t sz);
-  HTTP::Request_ptr updateDir(HTTPDirectory *dir, const std::string &hash,
-                              size_t sz);
-
-  void failedToGetRootIndex(HTTPRepository::ResultCode st);
-  void failedToUpdateChild(const SGPath &relativePath,
-                           HTTPRepository::ResultCode fileStatus);
-
-  void updatedChildSuccessfully(const SGPath &relativePath);
-
-  void checkForComplete();
-
-  typedef std::vector<RepoRequestPtr> RequestVector;
-  RequestVector queuedRequests, activeRequests;
-
-  void makeRequest(RepoRequestPtr req);
-
-  enum class RequestFinish { Done, Retry };
-
-  void finishedRequest(const RepoRequestPtr &req, RequestFinish retryRequest);
-
-  HTTPDirectory *getOrCreateDirectory(const std::string &path);
-  bool deleteDirectory(const std::string &relPath, const SGPath &absPath);
-
-
-  typedef std::vector<HTTPDirectory_ptr> DirectoryVector;
-  DirectoryVector directories;
-
-  void scheduleUpdateOfChildren(HTTPDirectory *dir);
-
-  SGPath installedCopyPath;
-
-  int countDirtyHashCaches() const;
-  void flushHashCaches();
-
-  enum ProcessResult { ProcessContinue, ProcessDone, ProcessFailed };
-
-  using RepoProcessTask = std::function<ProcessResult(HTTPRepoPrivate *repo)>;
-
-  void addTask(RepoProcessTask task);
-
-  std::deque<RepoProcessTask> pendingTasks;
-};
-
-} // namespace simgear
--- a/simgear/io/HTTPRequest.cxx
+++ b/simgear/io/HTTPRequest.cxx
@@ -18,9 +18,6 @@
 #include <simgear_config.h>
 #include "HTTPRequest.hxx"

-#include <cstring>
-#include <algorithm> // for std::min
-
 #include <simgear/compiler.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/strutils.hxx>
@@ -56,15 +53,6 @@ Request::~Request()

 }

-void Request::prepareForRetry() {
-  setReadyState(UNSENT);
-  _willClose = false;
-  _connectionCloseHeader = false;
-  _responseStatus = 0;
-  _responseLength = 0;
-  _receivedBodyBytes = 0;
-}
-
 //------------------------------------------------------------------------------
 Request* Request::done(const Callback& cb)
 {
@@ -202,16 +190,13 @@ void Request::onDone()
 //------------------------------------------------------------------------------
 void Request::onFail()
 {
-  // log if we FAIELD< but not if we CANCELLED
-  if (_ready_state == FAILED) {
-    SG_LOG
-    (
-      SG_IO,
-      SG_INFO,
-      "request failed:" << url() << " : "
-                        << responseCode() << "/" << responseReason()
-    );
-  }
+  SG_LOG
+  (
+    SG_IO,
+    SG_INFO,
+    "request failed:" << url() << " : "
+                      << responseCode() << "/" << responseReason()
+  );
 }

 //------------------------------------------------------------------------------
@@ -356,17 +341,12 @@ void Request::setSuccess(int code)
 //------------------------------------------------------------------------------
 void Request::setFailure(int code, const std::string& reason)
 {
-  // we use -1 for cancellation, don't be noisy in that case
-  if (code >= 0) { 
    SG_LOG(SG_IO, SG_WARN, "HTTP request: set failure:" << code << " reason " << reason);
-  }
-
  _responseStatus = code;
  _responseReason = reason;

-  if( !isComplete() ) {
-    setReadyState(code < 0 ? CANCELLED : FAILED);
-  }
+  if( !isComplete() )
+    setReadyState(FAILED);
 }

 //------------------------------------------------------------------------------
@@ -390,12 +370,6 @@ void Request::setReadyState(ReadyState state)

    _cb_fail(this);
  }
-  else if (state == CANCELLED )
-  {
-    onFail(); // do this for compatability
-    onAlways();
-    _cb_fail(this);
-  }
  else
    return;

@@ -425,7 +399,7 @@ bool Request::serverSupportsPipelining() const
 //------------------------------------------------------------------------------
 bool Request::isComplete() const
 {
-  return _ready_state == DONE || _ready_state == FAILED || _ready_state == CANCELLED;
+  return _ready_state == DONE || _ready_state == FAILED;
 }

 //------------------------------------------------------------------------------
--- a/simgear/io/HTTPRequest.hxx
+++ b/simgear/io/HTTPRequest.hxx
@@ -28,6 +28,8 @@
 #include <simgear/structure/SGSharedPtr.hxx>
 #include <simgear/math/sg_types.hxx>

+#include <boost/bind.hpp>
+
 class SGPropertyNode;

 namespace simgear
@@ -44,7 +46,7 @@ class Request:
  public SGReferenced
 {
 public:
-    typedef std::function<void(Request*)> Callback;
+    typedef boost::function<void(Request*)> Callback;

    enum ReadyState
    {
@@ -54,8 +56,7 @@ public:
      HEADERS_RECEIVED,
      LOADING,
      DONE,
-      FAILED,
-      CANCELLED
+      FAILED
    };

    virtual ~Request();
@@ -81,7 +82,7 @@ public:
    template<class C>
    Request* done(C* instance, void (C::*mem_func)(Request*))
    {
-      return done(std::bind(mem_func, instance, std::placeholders::_1));
+      return done(boost::bind(mem_func, instance, _1));
    }

    /**
@@ -96,7 +97,7 @@ public:
    template<class C>
    Request* fail(C* instance, void (C::*mem_func)(Request*))
    {
-      return fail(std::bind(mem_func, instance, std::placeholders::_1));
+      return fail(boost::bind(mem_func, instance, _1));
    }

    /**
@@ -111,7 +112,7 @@ public:
    template<class C>
    Request* always(C* instance, void (C::*mem_func)(Request*))
    {
-      return always(std::bind(mem_func, instance, std::placeholders::_1));
+      return always(boost::bind(mem_func, instance, _1));
    }

    /**
@@ -208,9 +209,7 @@ public:
     */
    bool serverSupportsPipelining() const;

-    virtual void prepareForRetry();
-
-  protected:
+protected:
    Request(const std::string& url, const std::string method = "GET");

    virtual void requestStart();
@@ -224,14 +223,12 @@ public:
    virtual void onFail();
    virtual void onAlways();

+    void setFailure(int code, const std::string& reason);
    void setSuccess(int code);
-    void setFailure(int code, const std::string &reason);
-
-  private:
+private:
    friend class Client;
    friend class Connection;
    friend class ContentDecoder;
-    friend class TestApi;

    Request(const Request&); // = delete;
    Request& operator=(const Request&); // = delete;
--- a/simgear/io/HTTPTestApi_private.hxx
+++ b/simgear/io/HTTPTestApi_private.hxx
@@ -1,45 +0,0 @@
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library 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
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
-
-#pragma once
-
-#include <functional>
-
-#include "HTTPRequest.hxx"
-
-namespace simgear {
-namespace HTTP {
-
-class Client;
-
-using ResponseDoneCallback =
-    std::function<bool(int curlResult, Request_ptr req)>;
-
-/**
- * @brief this API is for unit-testing HTTP code.
- * Don't use it for anything else. It's for unit-testing.
- */
-class TestApi {
-public:
-  // alow test suite to manipulate requests to simulate network errors;
-  // without this, it's hard to provoke certain failures in a loop-back
-  // network sitation.
-  static void setResponseDoneCallback(Client *cl, ResponseDoneCallback cb);
-
-  static void markRequestAsFailed(Request_ptr req, int curlCode,
-                                  const std::string &message);
-};
-
-} // namespace HTTP
-} // namespace simgear
--- a/simgear/io/httpget.cxx
+++ b/simgear/io/httpget.cxx
@@ -5,6 +5,8 @@
 #include <signal.h>

 #include <iostream>
+#include <boost/foreach.hpp>
+

 #include <simgear/io/sg_file.hxx>
 #include <simgear/io/HTTPClient.hxx>
@@ -27,17 +29,17 @@ public:
        _complete(false),
        _file(NULL)
    {
-
+        
    }
-
+    
    void setFile(SGFile* f)
    {
        _file = f;
    }
-
+    
    bool complete() const
        { return _complete; }
-
+        
    void addHeader(const string& h)
    {
        int colonPos = h.find(':');
@@ -45,22 +47,22 @@ public:
            cerr << "malformed header: " << h << endl;
            return;
        }
-
+        
        string key = h.substr(0, colonPos);
        requestHeader(key) = h.substr(colonPos + 1);
    }
-
+    
 protected:
    virtual void onDone()
    {
        _complete = true;
-    }
+    }  

    virtual void gotBodyData(const char* s, int n)
    {
        _file->write(s, n);
    }
-private:
+private:    
    bool _complete;
    SGFile* _file;
 };
@@ -72,7 +74,7 @@ int main(int argc, char* argv[])
    string proxy, proxyAuth;
    string_list headers;
    string url;
-
+    
    for (int a=0; a<argc;++a) {
        if (argv[a][0] == '-') {
            if (!strcmp(argv[a], "--user-agent")) {
@@ -103,7 +105,7 @@ int main(int argc, char* argv[])
            proxyHost = proxy.substr(0, colonPos);
            proxyPort = strutils::to_int(proxy.substr(colonPos + 1));
        }
-
+        
        cl.setProxy(proxyHost, proxyPort, proxyAuth);
    }

@@ -121,23 +123,23 @@ int main(int argc, char* argv[])
    }

    ARequest* req = new ARequest(url);
-    for (const auto& h : headers) {
+    BOOST_FOREACH(string h, headers) {
        req->addHeader(h);
    }
-
+    
    req->setFile(outFile);
    cl.makeRequest(req);
-
+    
    while (!req->complete()) {
        cl.update();
        SGTimeStamp::sleepForMSec(100);
    }
-
+        
    if (req->responseCode() != 200) {
        cerr << "got response:" << req->responseCode() << endl;
        cerr << "\treason:" << req->responseReason() << endl;
        return EXIT_FAILURE;
    }
-
+    
    return EXIT_SUCCESS;
 }
--- a/simgear/io/iostreams/gzcontainerfile.cxx
+++ b/simgear/io/iostreams/gzcontainerfile.cxx
@@ -71,10 +71,10 @@ static const uint32_t EndianMagic = 0x11223344;
 * gzContainerWriter
 **************************************************************************/

-gzContainerWriter::gzContainerWriter(const SGPath& name,
+gzContainerWriter::gzContainerWriter(const std::string& name,
                                     const std::string& fileMagic) :
        sg_gzofstream(name, ios_out | ios_binary),
-        filename(name.utf8Str())
+        filename(name)
 {
    /* write byte-order marker **************************************/
    write((char*)&EndianMagic, sizeof(EndianMagic));
@@ -138,10 +138,10 @@ gzContainerWriter::writeContainer(ContainerType Type, SGPropertyNode* root)
 * gzContainerReader
 **************************************************************************/

-gzContainerReader::gzContainerReader(const SGPath& name,
+gzContainerReader::gzContainerReader(const std::string& name,
                                     const std::string& fileMagic) :
        sg_gzifstream(SGPath(name), ios_in | ios_binary),
-        filename(name.utf8Str())
+        filename(name)
 {
    bool ok = (good() && !eof());

--- a/simgear/io/iostreams/gzcontainerfile.hxx
+++ b/simgear/io/iostreams/gzcontainerfile.hxx
@@ -35,7 +35,7 @@ typedef int ContainerType;
 class gzContainerReader : public sg_gzifstream
 {
 public:
-    gzContainerReader( const SGPath& name,
+    gzContainerReader( const std::string& name,
                       const std::string& fileMagic);

    bool readContainerHeader(ContainerType* pType, size_t* pSize);
@@ -48,7 +48,7 @@ private:
 class gzContainerWriter : public sg_gzofstream
 {
 public:
-    gzContainerWriter( const SGPath& name,
+    gzContainerWriter( const std::string& name,
                       const std::string& fileMagic);

    bool writeContainerHeader(ContainerType Type, size_t Size);
--- a/simgear/io/iostreams/gzfstream.cxx
+++ b/simgear/io/iostreams/gzfstream.cxx
@@ -185,9 +185,6 @@ gzfilebuf::setcompressionstrategy( int comp_strategy )

 z_off_t
 gzfilebuf::approxOffset() {
-    #ifdef __OpenBSD__
-    z_off_t res = 0;
-    #else
    z_off_t res = gzoffset(file);

    if (res == -1) {
@@ -204,7 +201,7 @@ gzfilebuf::approxOffset() {
        SG_LOG( SG_GENERAL, SG_ALERT, errMsg );
        throw sg_io_exception(errMsg);
    }
-    #endif
+
    return res;
 }

--- a/simgear/io/iostreams/sgstream.cxx
+++ b/simgear/io/iostreams/sgstream.cxx
@@ -212,7 +212,7 @@ sg_ifstream::sg_ifstream(const SGPath& path, ios_openmode io_mode)
 #if defined(SG_WINDOWS)
 	std::wstring ps = path.wstr();
 #else
-    std::string ps = path.utf8Str();
+    std::string ps = path.local8BitStr();
 #endif
 	std::ifstream::open(ps.c_str(), io_mode);
 }
@@ -222,31 +222,17 @@ void sg_ifstream::open( const SGPath& name, ios_openmode io_mode )
 #if defined(SG_WINDOWS)
 	std::wstring ps = name.wstr();
 #else
-	std::string ps = name.utf8Str();
+	std::string ps = name.local8BitStr();
 #endif
    std::ifstream::open(ps.c_str(), io_mode);
 }

-std::string sg_ifstream::read_all()
-{
-	this->seekg(0, std::ios::end); // seek to end
-	const auto pos = this->tellg();
-
-	std::string result;
-	result.resize(pos);
-
-	this->seekg(0, std::ios::beg);
-	this->read(const_cast<char*>(result.data()), pos);
-    return result;
-}
-
-
 sg_ofstream::sg_ofstream(const SGPath& path, ios_openmode io_mode)
 {
 #if defined(SG_WINDOWS)
 	std::wstring ps = path.wstr();
 #else
-	std::string ps = path.utf8Str();
+	std::string ps = path.local8BitStr();
 #endif
    std::ofstream::open(ps.c_str(), io_mode);
 }
@@ -256,7 +242,7 @@ void sg_ofstream::open( const SGPath& name, ios_openmode io_mode )
 #if defined(SG_WINDOWS)
 	std::wstring ps = name.wstr();
 #else
-	std::string ps = name.utf8Str();
+	std::string ps = name.local8BitStr();
 #endif
    std::ofstream::open(ps.c_str(), io_mode);
 }
--- a/simgear/io/iostreams/sgstream.hxx
+++ b/simgear/io/iostreams/sgstream.hxx
@@ -196,10 +196,6 @@ public:

    void open( const SGPath& name,
 	       ios_openmode io_mode = ios_in|ios_binary );
-    
-    /// read the entire stream into a buffer. Use on files, etc - not recommended on streams
-    /// which never EOF, will bvlock forever.
-    std::string read_all();
 };

 class sg_ofstream : public std::ofstream
--- a/simgear/io/iostreams/zlibstream_test.cxx
+++ b/simgear/io/iostreams/zlibstream_test.cxx
@@ -431,7 +431,7 @@ void test_ZlibDecompressorIStream_readPutbackEtc()
    try {
      // 'Z' is not the last character read from the stream
      decompressor.putback('Z');
-    } catch (const std::ios_base::failure&) {
+    } catch (std::ios_base::failure) {
      gotException = true;
    } catch (const std::exception& e) {
      // gcc fails to catch std::ios_base::failure due to an inconsistent C++11
--- a/simgear/io/raw_socket.cxx
+++ b/simgear/io/raw_socket.cxx
@@ -36,7 +36,6 @@
 #include <cstring>
 #include <cassert>
 #include <cstdio> // for snprintf
-#include <mutex>
 #include <errno.h>

 #if defined(WINSOCK)
@@ -214,7 +213,7 @@ private:
      return ok;
    }

-    std::mutex _lock;
+    SGMutex _lock;
    SGWaitCondition _wait;

    typedef std::map<string, simgear::IPAddress*> AddressCache;
--- a/simgear/io/sg_binobj.cxx
+++ b/simgear/io/sg_binobj.cxx
@@ -42,7 +42,6 @@

 #include <simgear/bucket/newbucket.hxx>
 #include <simgear/misc/sg_path.hxx>
-#include <simgear/misc/strutils.hxx>
 #include <simgear/math/SGGeometry.hxx>
 #include <simgear/structure/exception.hxx>

@@ -161,7 +160,7 @@ public:
        }
    }

-    int32_t readInt()
+    float readInt()
    {
        unsigned int* p = reinterpret_cast<unsigned int*>(ptr + offset);
        if ( sgIsBigEndian() ) {
@@ -564,12 +563,6 @@ bool SGBinObject::read_bin( const SGPath& file ) {
    // read headers
    unsigned int header;
    sgReadUInt( fp, &header );
-
-    if (sgReadError()) {
-        gzclose(fp);
-        throw sg_io_exception("Unable to read BTG header: " + simgear::strutils::error_string(errno), sg_location(file));
-    }
-
    if ( ((header & 0xFF000000) >> 24) == 'S' &&
         ((header & 0x00FF0000) >> 16) == 'G' ) {

--- a/simgear/io/sg_binobj.hxx
+++ b/simgear/io/sg_binobj.hxx
@@ -34,15 +34,18 @@
 #include <simgear/math/sg_types.hxx>
 #include <simgear/math/SGMath.hxx>

-#include <array>
-#include <string>
 #include <vector>
+#include <string>
+#include <boost/array.hpp>

 #define MAX_TC_SETS     (4)
 #define MAX_VAS         (8)

-typedef std::array<int_list, MAX_TC_SETS> tci_list;
-typedef std::array<int_list, MAX_VAS>     vai_list;
+// I really want to pass around fixed length arrays, as the size 
+// has to be hardcoded
+// but it's a C++0x feature use boost in its absence
+typedef boost::array<int_list, MAX_TC_SETS> tci_list;
+typedef boost::array<int_list, MAX_VAS>     vai_list;

 /** STL Structure used to store (integer index) object information */
 typedef std::vector < int_list > group_list;
--- a/simgear/io/sg_file.cxx
+++ b/simgear/io/sg_file.cxx
@@ -64,41 +64,6 @@ SGFile::SGFile( int existingFd ) :
 SGFile::~SGFile() {
 }

-#include <simgear/misc/sg_hash.hxx>
-#include <simgear/structure/exception.hxx>
-#include "simgear/misc/strutils.hxx"
-
-std::string SGFile::computeHash()
-{
-    if (!file_name.exists())
-        return {};
-        
-    simgear::sha1nfo info;
-    sha1_init(&info);
-    
-    // unique_ptr with custom deleter for exception safety
-    const int bufSize = 1024 * 1024;
-    std::unique_ptr<char, std::function<void(char*)>> buf{static_cast<char*>(malloc(bufSize)), 
-        [](char* p) { free(p); }};
-
-    if (!buf) {
-        SG_LOG(SG_IO, SG_ALERT, "Failed to malloc buffer for SHA1 check");
-    }
-
-    size_t readLen;
-    SGBinaryFile f(file_name);
-    if (!f.open(SG_IO_IN)) {
-        SG_LOG(SG_IO, SG_ALERT, "SGFile::computeHash: Failed to open " << file_name);
-        return {};
-    }
-    while ((readLen = f.read(buf.get(), bufSize)) > 0) {
-        sha1_write(&info, buf.get(), readLen);
-    }
-
-    f.close();
-    std::string hashBytes((char*)sha1_result(&info), HASH_LENGTH);
-    return simgear::strutils::encodeHex(hashBytes);
-}

 // open the file based on specified direction
 bool SGFile::open( const SGProtocolDir d ) {
--- a/simgear/io/sg_file.hxx
+++ b/simgear/io/sg_file.hxx
@@ -87,9 +87,6 @@ public:

    /** @return true of eof conditions exists */
    virtual bool eof() const { return eof_flag; };
-
-    std::string computeHash();
-
 };

 class SGBinaryFile : public SGFile {
--- a/simgear/io/test_DNS.cxx
+++ b/simgear/io/test_DNS.cxx
@@ -7,6 +7,8 @@
 #include <thread>
 #include <atomic>

+#include <boost/algorithm/string/case_conv.hpp>
+
 #include <simgear/simgear_config.h>

 #include "DNSClient.hxx"
--- a/simgear/io/test_HTTP.cxx
+++ b/simgear/io/test_HTTP.cxx
@@ -1,10 +1,12 @@
 #include <cstdlib>
-#include <cstring>
+
 #include <iostream>
 #include <map>
 #include <sstream>
 #include <cerrno>

+#include <boost/algorithm/string/case_conv.hpp>
+
 #include <simgear/simgear_config.h>

 #include "HTTPClient.hxx"
@@ -59,23 +61,23 @@ public:
    std::map<string, string> headers;
 protected:

-    void onDone() override
+    virtual void onDone()
    {
        complete = true;
    }
- 
-    void onFail() override
+
+    virtual void onFail()
    {
        failed = true;
    }

-    void gotBodyData(const char* s, int n) override
+    virtual void gotBodyData(const char* s, int n)
    {
-    //    std::cout << "got body data:'" << string(s, n) << "'" <<std::endl;
+        //std::cout << "got body data:'" << string(s, n) << "'" <<std::endl;
        bodyData += string(s, n);
    }

-    void responseHeader(const string& header, const string& value) override
+    virtual void responseHeader(const string& header, const string& value)
    {
        Request::responseHeader(header, value);
        headers[header] =  value;
@@ -379,26 +381,6 @@ void waitForFailed(HTTP::Client* cl, TestRequest* tr)
    cerr << "timed out waiting for failure" << endl;
 }

-using CompletionCheck = std::function<bool()>;
-
-bool waitFor(HTTP::Client* cl, CompletionCheck ccheck)
-{
-    SGTimeStamp start(SGTimeStamp::now());
-    while (start.elapsedMSec() <  10000) {
-        cl->update();
-        testServer.poll();
-
-        if (ccheck()) {
-            return true;
-        }
-        SGTimeStamp::sleepForMSec(15);
-    }
-
-    cerr << "timed out" << endl;
-    return false;
-}
-
-
 int main(int argc, char* argv[])
 {
    sglog().setLogLevels( SG_ALL, SG_INFO );
@@ -474,8 +456,6 @@ int main(int argc, char* argv[])

 // larger get request
    for (unsigned int i=0; i<body2Size; ++i) {
-        // this contains embeded 0s on purpose, i.e it's
-        // not text data but binary
        body2[i] = (i << 4) | (i >> 2);
    }

@@ -620,10 +600,9 @@ cout << "testing proxy close" << endl;
        HTTP::Request_ptr own3(tr3);
        cl.makeRequest(tr3);

-        SG_VERIFY(waitFor(&cl, [tr, tr2, tr3]() {
-            return tr->complete && tr2->complete &&tr3->complete; 
-        }));
-
+        waitForComplete(&cl, tr3);
+        SG_VERIFY(tr->complete);
+        SG_VERIFY(tr2->complete);
        SG_CHECK_EQUAL(tr->bodyData, string(BODY1));

        SG_CHECK_EQUAL(tr2->responseLength(), strlen(BODY3));
@@ -652,9 +631,9 @@ cout << "testing proxy close" << endl;
        HTTP::Request_ptr own3(tr3);
        cl.makeRequest(tr3);

-        SG_VERIFY(waitFor(&cl, [tr, tr2, tr3]() {
-            return tr->complete && tr2->complete &&tr3->complete; 
-        }));
+        waitForComplete(&cl, tr3);
+        SG_VERIFY(tr->complete);
+        SG_VERIFY(tr2->complete);

        SG_CHECK_EQUAL(tr->responseLength(), strlen(BODY1));
        SG_CHECK_EQUAL(tr->responseBytesReceived(), strlen(BODY1));
@@ -781,15 +760,8 @@ cout << "testing proxy close" << endl;
        SG_CHECK_EQUAL(tr3->bodyData, string(BODY1));
    }

-    // disabling this test for now, since it seems to have changed depending
-    // on the libCurl version. (Or some other configuration which is currently
-    // not apparent).
-    // old behaviour: Curl sends the second request soon after makeRequest
-    // new behaviour: Curl waits for the first request to complete, before
-    // sending the second request (i.e acts as if HTTP pipelining is disabled)
-#if 0
    {
-        cout << "get-during-response-send\n\n" << endl;
+        cout << "get-during-response-send" << endl;
        cl.clearAllConnections();
        //test_get_during_send

@@ -809,10 +781,7 @@ cout << "testing proxy close" << endl;
        HTTP::Request_ptr own2(tr2);
        cl.makeRequest(tr2);

-        SG_VERIFY(waitFor(&cl, [tr, tr2]() {
-            return tr->isComplete() && tr2->isComplete();
-        }));
-        
+        waitForComplete(&cl, tr2);
        SG_CHECK_EQUAL(tr->responseCode(), 200);
        SG_CHECK_EQUAL(tr->bodyData, string(BODY3));
        SG_CHECK_EQUAL(tr->responseBytesReceived(), strlen(BODY3));
@@ -820,7 +789,6 @@ cout << "testing proxy close" << endl;
        SG_CHECK_EQUAL(tr2->bodyData, string(BODY1));
        SG_CHECK_EQUAL(tr2->responseBytesReceived(), strlen(BODY1));
    }
-#endif
    
    {
        cout << "redirect test" << endl;
--- a/simgear/io/test_HTTP.hxx
+++ b/simgear/io/test_HTTP.hxx
@@ -1,7 +1,6 @@
 #ifndef SIMGEAR_IO_TEST_HTTP_HXX
 #define SIMGEAR_IO_TEST_HTTP_HXX

-#include <algorithm>
 #include <sstream>
 #include <vector>

--- a/simgear/io/test_repository.cxx
+++ b/simgear/io/test_repository.cxx
@@ -1,18 +1,17 @@
-#include <cassert>
 #include <cstdlib>
-#include <errno.h>
-#include <fcntl.h>
-#include <functional>
 #include <iostream>
 #include <map>
 #include <sstream>
+#include <errno.h>
+#include <fcntl.h>
+
+#include <boost/algorithm/string/case_conv.hpp>

 #include <simgear/simgear_config.h>

-#include "HTTPClient.hxx"
-#include "HTTPRepository.hxx"
-#include "HTTPTestApi_private.hxx"
 #include "test_HTTP.hxx"
+#include "HTTPRepository.hxx"
+#include "HTTPClient.hxx"

 #include <simgear/misc/strutils.hxx>
 #include <simgear/misc/sg_hash.hxx>
@@ -27,8 +26,6 @@

 using namespace simgear;

-using TestApi = simgear::HTTP::TestApi;
-
 std::string dataForFile(const std::string& parentName, const std::string& name, int revision)
 {
    std::ostringstream os;
@@ -49,9 +46,6 @@ std::string hashForData(const std::string& d)
    return strutils::encodeHex(sha1_result(&info), HASH_LENGTH);
 }

-class TestRepoEntry;
-using AccessCallback = std::function<void(TestRepoEntry &entry)>;
-
 class TestRepoEntry
 {
 public:
@@ -77,8 +71,7 @@ public:
    int requestCount;
    bool getWillFail;
    bool returnCorruptData;
-
-    AccessCallback accessCallback;
+    std::unique_ptr<SGCallback> accessCallback;

    void clearRequestCounts();

@@ -278,8 +271,8 @@ public:
                return;
            }

-            if (entry->accessCallback) {
-              entry->accessCallback(*entry);
+            if (entry->accessCallback.get()) {
+                (*entry->accessCallback)();
            }

            if (entry->getWillFail) {
@@ -290,29 +283,20 @@ public:
            entry->requestCount++;

            std::string content;
-            bool closeSocket = false;
-            size_t contentSize = 0;
-
            if (entry->returnCorruptData) {
                content = dataForFile("!$£$!" + entry->parent->name,
                                      "corrupt_" + entry->name,
                                      entry->revision);
-                contentSize = content.size();
            } else {
-              content = entry->data();
-              contentSize = content.size();
+                content = entry->data();
            }

            std::stringstream d;
            d << "HTTP/1.1 " << 200 << " " << reasonForCode(200) << "\r\n";
-            d << "Content-Length:" << contentSize << "\r\n";
+            d << "Content-Length:" << content.size() << "\r\n";
            d << "\r\n"; // final CRLF to terminate the headers
            d << content;
            push(d.str().c_str());
-
-            if (closeSocket) {
-              closeWhenDone();
-            }
        } else {
            sendErrorResponse(404, false, "");
        }
@@ -409,7 +393,6 @@ void waitForUpdateComplete(HTTP::Client* cl, HTTPRepository* repo)
        cl->update();
        testServer.poll();

-        repo->process();
        if (!repo->isDoingSync()) {
            return;
        }
@@ -419,16 +402,6 @@ void waitForUpdateComplete(HTTP::Client* cl, HTTPRepository* repo)
    std::cerr << "timed out" << std::endl;
 }

-void runForTime(HTTP::Client *cl, HTTPRepository *repo, int msec = 15) {
-  SGTimeStamp start(SGTimeStamp::now());
-  while (start.elapsedMSec() < msec) {
-    cl->update();
-    testServer.poll();
-    repo->process();
-    SGTimeStamp::sleepForMSec(1);
-  }
-}
-
 void testBasicClone(HTTP::Client* cl)
 {
    std::unique_ptr<HTTPRepository> repo;
@@ -646,19 +619,9 @@ void testAbandonCorruptFiles(HTTP::Client* cl)
    repo->setBaseUrl("http://localhost:2000/repo");
    repo->update();
    waitForUpdateComplete(cl, repo.get());
-    if (repo->failure() != HTTPRepository::REPO_PARTIAL_UPDATE) {
-      std::cerr << "Got failure state:" << repo->failure() << std::endl;
-      throw sg_exception("Bad result from corrupt files test");
-    }
-
-    auto failedFiles = repo->failures();
-    if (failedFiles.size() != 1) {
-      throw sg_exception("Bad result from corrupt files test");
-    }
-
-    if (failedFiles.front().path.utf8Str() != "dirB/subdirG/fileBGA") {
-      throw sg_exception("Bad path from corrupt files test:" +
-                         failedFiles.front().path.utf8Str());
+    if (repo->failure() != HTTPRepository::REPO_ERROR_CHECKSUM) {
+        std::cerr << "Got failure state:" << repo->failure() << std::endl;
+        throw sg_exception("Bad result from corrupt files test");
    }

    repo.reset();
@@ -695,21 +658,15 @@ void testServerModifyDuringSync(HTTP::Client* cl)
    repo.reset(new HTTPRepository(p, cl));
    repo->setBaseUrl("http://localhost:2000/repo");

-    global_repo->findEntry("dirA/fileAA")->accessCallback =
-        [](const TestRepoEntry &r) {
-          std::cout << "Modifying sub-tree" << std::endl;
-          global_repo->findEntry("dirB/subdirA/fileBAC")->revision++;
-          global_repo->defineFile("dirB/subdirZ/fileBZA");
-          global_repo->findEntry("dirB/subdirB/fileBBB")->revision++;
-        };
+    global_repo->findEntry("dirA/fileAA")->accessCallback.reset(make_callback(&modifyBTree));

    repo->update();
    waitForUpdateComplete(cl, repo.get());

-    global_repo->findEntry("dirA/fileAA")->accessCallback = AccessCallback{};
+    global_repo->findEntry("dirA/fileAA")->accessCallback.reset();

-    if (repo->failure() != HTTPRepository::REPO_PARTIAL_UPDATE) {
-      throw sg_exception("Bad result from modify during sync test");
+    if (repo->failure() != HTTPRepository::REPO_ERROR_CHECKSUM) {
+        throw sg_exception("Bad result from modify during sync test");
    }

    std::cout << "Passed test modify server during sync" << std::endl;
@@ -799,103 +756,6 @@ void testCopyInstalledChildren(HTTP::Client* cl)
    std::cout << "passed Copy installed children" << std::endl;
 }

-void testRetryAfterSocketFailure(HTTP::Client *cl) {
-  global_repo->clearRequestCounts();
-  global_repo->clearFailFlags();
-
-  std::unique_ptr<HTTPRepository> repo;
-  SGPath p(simgear::Dir::current().path());
-  p.append("http_repo_retry_after_socket_fail");
-  simgear::Dir pd(p);
-  if (pd.exists()) {
-    pd.removeChildren();
-  }
-
-  repo.reset(new HTTPRepository(p, cl));
-  repo->setBaseUrl("http://localhost:2000/repo");
-
-  int aaFailsRemaining = 2;
-  int subdirBAFailsRemaining = 2;
-  TestApi::setResponseDoneCallback(
-      cl, [&aaFailsRemaining, &subdirBAFailsRemaining](int curlResult,
-                                                       HTTP::Request_ptr req) {
-        if (req->url() == "http://localhost:2000/repo/dirA/fileAA") {
-          if (aaFailsRemaining == 0)
-            return false;
-
-          --aaFailsRemaining;
-          TestApi::markRequestAsFailed(req, 56, "Simulated socket failure");
-          return true;
-        } else if (req->url() ==
-                   "http://localhost:2000/repo/dirB/subdirA/.dirindex") {
-          if (subdirBAFailsRemaining == 0)
-            return false;
-
-          --subdirBAFailsRemaining;
-          TestApi::markRequestAsFailed(req, 56, "Simulated socket failure");
-          return true;
-        } else {
-          return false;
-        }
-      });
-
-  repo->update();
-  waitForUpdateComplete(cl, repo.get());
-
-  if (repo->failure() != HTTPRepository::REPO_NO_ERROR) {
-    throw sg_exception("Bad result from retry socket failure test");
-  }
-
-  verifyFileState(p, "dirA/fileAA");
-  verifyFileState(p, "dirB/subdirA/fileBAA");
-  verifyFileState(p, "dirB/subdirA/fileBAC");
-
-  verifyRequestCount("dirA/fileAA", 3);
-  verifyRequestCount("dirB/subdirA", 3);
-  verifyRequestCount("dirB/subdirA/fileBAC", 1);
-}
-
-void testPersistentSocketFailure(HTTP::Client *cl) {
-  global_repo->clearRequestCounts();
-  global_repo->clearFailFlags();
-
-  std::unique_ptr<HTTPRepository> repo;
-  SGPath p(simgear::Dir::current().path());
-  p.append("http_repo_persistent_socket_fail");
-  simgear::Dir pd(p);
-  if (pd.exists()) {
-    pd.removeChildren();
-  }
-
-  repo.reset(new HTTPRepository(p, cl));
-  repo->setBaseUrl("http://localhost:2000/repo");
-
-  TestApi::setResponseDoneCallback(
-      cl, [](int curlResult, HTTP::Request_ptr req) {
-        const auto url = req->url();
-        if (url.find("http://localhost:2000/repo/dirB") == 0) {
-          TestApi::markRequestAsFailed(req, 56, "Simulated socket failure");
-          return true;
-        }
-
-        return false;
-      });
-
-  repo->update();
-  waitForUpdateComplete(cl, repo.get());
-
-  if (repo->failure() != HTTPRepository::REPO_PARTIAL_UPDATE) {
-    throw sg_exception("Bad result from retry socket failure test");
-  }
-
-  verifyFileState(p, "dirA/fileAA");
-  verifyRequestCount("dirA/fileAA", 1);
-
-  verifyRequestCount("dirD/fileDA", 1);
-  verifyRequestCount("dirD/subdirDA/fileDAA", 1);
-  verifyRequestCount("dirD/subdirDB/fileDBA", 1);
-}
-
 int main(int argc, char* argv[])
 {
  sglog().setLogLevels( SG_ALL, SG_INFO );
@@ -941,8 +801,6 @@ int main(int argc, char* argv[])
    cl.clearAllConnections();

    testCopyInstalledChildren(&cl);
-    testRetryAfterSocketFailure(&cl);
-    testPersistentSocketFailure(&cl);

    std::cout << "all tests passed ok" << std::endl;
    return 0;
--- a/simgear/io/text_DNS.cxx
+++ b/simgear/io/text_DNS.cxx
@@ -5,6 +5,8 @@
 #include <sstream>
 #include <errno.h>

+#include <boost/algorithm/string/case_conv.hpp>
+
 #include <simgear/simgear_config.h>

 #include "HTTPClient.hxx"
--- a/simgear/io/untar.cxx
+++ b/simgear/io/untar.cxx
@@ -31,8 +31,6 @@
 #include <simgear/sg_inlines.h>
 #include <simgear/io/sg_file.hxx>
 #include <simgear/misc/sg_dir.hxx>
-#include <simgear/misc/strutils.hxx>
-
 #include <simgear/io/iostreams/sgstream.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/package/unzip.h>
@@ -50,8 +48,6 @@ namespace simgear
 			assert(outer);
 		}

-        virtual ~ArchiveExtractorPrivate() = default;
-        
 		typedef enum {
 			INVALID = 0,
 			READING_HEADER,
@@ -342,7 +338,7 @@ public:
        }
        
        if (!isSafePath(tarPath)) {
-            SG_LOG(SG_IO, SG_WARN, "unsafe tar path, skipping::" << tarPath);
+            SG_LOG(SG_IO, SG_WARN, "bad tar path:" << tarPath);
            skipCurrentEntry = true;
        }

@@ -508,7 +504,7 @@ public:
 #endif
 		unzFile zip = unzOpen2(bufferName, &memoryAccessFuncs);

-		const size_t BUFFER_SIZE = 1024 * 1024;
+		const size_t BUFFER_SIZE = 32 * 1024;
 		void* buf = malloc(BUFFER_SIZE);

 		try {
@@ -534,28 +530,24 @@ public:
 			state = END_OF_ARCHIVE;
 		}
 		catch (sg_exception&) {
-            state = BAD_ARCHIVE;
-        }
-        
-        free(buf);
-        unzClose(zip);
-    }
-    
-    void extractCurrentFile(unzFile zip, char* buffer, size_t bufferSize)
-    {
-        unz_file_info fileInfo;
-        int result = unzGetCurrentFileInfo(zip, &fileInfo,
-                                           buffer, bufferSize,
-                                           NULL, 0,  /* extra field */
-                                           NULL, 0 /* comment field */);
-        if (result != Z_OK) {
-            throw sg_io_exception("Failed to get zip current file info");
-        }
-        
+			state = BAD_ARCHIVE;
+		}
+
+		free(buf);
+		unzClose(zip);
+	}
+
+	void extractCurrentFile(unzFile zip, char* buffer, size_t bufferSize)
+	{
+		unz_file_info fileInfo;
+		unzGetCurrentFileInfo(zip, &fileInfo,
+			buffer, bufferSize,
+			NULL, 0,  /* extra field */
+			NULL, 0 /* comment field */);
+
 		std::string name(buffer);
 		if (!isSafePath(name)) {
-            SG_LOG(SG_IO, SG_WARN, "unsafe zip path, skipping::" << name);
-            return;
+			throw sg_format_exception("Bad zip path", name);
 		}

 		auto filterResult = filterPath(name);
@@ -574,7 +566,7 @@ public:
 			return;
 		}

-		result = unzOpenCurrentFile(zip);
+		int result = unzOpenCurrentFile(zip);
 		if (result != UNZ_OK) {
 			throw sg_io_exception("opening current zip file failed", sg_location(name));
 		}
@@ -594,7 +586,7 @@ public:

 		outFile.open(path, std::ios::binary | std::ios::trunc | std::ios::out);
 		if (outFile.fail()) {
-			throw sg_io_exception("failed to open output file for writing:" + strutils::error_string(errno), path);
+			throw sg_io_exception("failed to open output file for writing", path);
 		}

 		while (!eof) {
@@ -622,7 +614,10 @@ ArchiveExtractor::ArchiveExtractor(const SGPath& rootPath) :
 {
 }

-ArchiveExtractor::~ArchiveExtractor() = default;
+ArchiveExtractor::~ArchiveExtractor()
+{
+
+}

 void ArchiveExtractor::extractBytes(const uint8_t* bytes, size_t count)
 {
@@ -640,7 +635,7 @@ void ArchiveExtractor::extractBytes(const uint8_t* bytes, size_t count)
 			d.reset(new ZipExtractorPrivate(this));
 		}
 		else {
-			SG_LOG(SG_IO, SG_WARN, "Invalid archive type");
+			SG_LOG(SG_IO, SG_ALERT, "Invcalid archive type");
 			_invalidDataType = true;
 			return;
 		}
@@ -730,10 +725,8 @@ ArchiveExtractor::DetermineResult ArchiveExtractor::isTarData(const uint8_t* byt
        }

        int result = inflate(&z, Z_SYNC_FLUSH);
-        if ((result == Z_OK) || (result == Z_STREAM_END)) {
-            // all good
-        } else {
-            SG_LOG(SG_IO, SG_WARN, "isTarData: Zlib inflate failed:" << result);
+        if (result != Z_OK) {
+            SG_LOG(SG_IO, SG_WARN, "inflate failed:" << result);
            inflateEnd(&z);
            return Invalid; // not tar data
        }
--- a/simgear/io/untar.hxx
+++ b/simgear/io/untar.hxx
@@ -34,7 +34,7 @@ class ArchiveExtractor
 {
 public:
 	ArchiveExtractor(const SGPath& rootPath);
-	virtual ~ArchiveExtractor();
+	~ArchiveExtractor();

 	enum DetermineResult
 	{
--- a/simgear/math/SGGeodesy.cxx
+++ b/simgear/math/SGGeodesy.cxx
@@ -537,13 +537,6 @@ SGGeodesy::advanceRadM(const SGGeoc& geoc, double course, double distance,
  }
 }

-SGGeoc SGGeodesy::advanceDegM(const SGGeoc &geoc, double course,
-                              double distance) {
-  SGGeoc result;
-  advanceRadM(geoc, course * SG_DEGREES_TO_RADIANS, distance, result);
-  return result;
-}
-
 double
 SGGeodesy::courseRad(const SGGeoc& from, const SGGeoc& to)
 {
--- a/simgear/math/SGGeodesy.hxx
+++ b/simgear/math/SGGeodesy.hxx
@@ -65,9 +65,6 @@ public:
  // Geocentric course/distance computation
  static void advanceRadM(const SGGeoc& geoc, double course, double distance,
                          SGGeoc& result);
-
-  static SGGeoc advanceDegM(const SGGeoc &geoc, double course, double distance);
-
  static double courseRad(const SGGeoc& from, const SGGeoc& to);
  static double distanceRad(const SGGeoc& from, const SGGeoc& to);
  static double distanceM(const SGGeoc& from, const SGGeoc& to);
--- a/simgear/math/SGVec2.hxx
+++ b/simgear/math/SGVec2.hxx
@@ -193,8 +193,8 @@ min(S s, SGVec2<T> v)
 template<typename T>
 inline
 SGVec2<T>
-max(SGVec2<T> v1, const SGVec2<T>& v2)
-{ v1.simd2() = simd4::max(v1.simd2(), v2.simd2()); return v1; }
+max(const SGVec2<T>& v1, const SGVec2<T>& v2)
+{ v1 = simd4::max(v1.simd2(), v2.simd2()); return v1; }
 template<typename S, typename T>
 inline
 SGVec2<T>
@@ -375,29 +375,6 @@ interpolate(T tau, const SGVec2<T>& v1, const SGVec2<T>& v2)
  return r;
 }

-// Helper function for point_in_triangle
-template <typename T>
-inline
-T
-pt_determine(const SGVec2<T>& pt1, const SGVec2<T>& pt2, const SGVec2<T>& pt3)
-{
-  return (pt1.x()-pt3.x()) * (pt2.y()-pt3.y()) - (pt2.x() - pt3.x()) * (pt1.y() - pt3.y());
-}
-
-// Is testpt inside the triangle formed by the other three points?
-template <typename T>
-inline
-bool
-point_in_triangle(const SGVec2<T>& testpt, const SGVec2<T>& pt1, const SGVec2<T>& pt2, const SGVec2<T>& pt3)
-{
-  T d1 = pt_determine(testpt,pt1,pt2);
-  T d2 = pt_determine(testpt,pt2,pt3);
-  T d3 = pt_determine(testpt,pt3,pt1);
-  bool has_neg = (d1 < 0) || (d2 < 0) || (d3 < 0);
-  bool has_pos = (d1 > 0) || (d2 > 0) || (d3 > 0);
-  return !(has_neg && has_pos);
-}
-
 #ifndef NDEBUG
 template<typename T>
 inline
--- a/simgear/math/interpolater.cxx
+++ b/simgear/math/interpolater.cxx
@@ -56,6 +56,8 @@ SGInterpTable::SGInterpTable(const SGPropertyNode* interpolation)
 // file
 SGInterpTable::SGInterpTable( const std::string& file )
 {
+    SG_LOG( SG_MATH, SG_INFO, "Initializing Interpolator for " << file );
+
    sg_gzifstream in( SGPath::fromUtf8(file) );
    if ( !in.is_open() ) {
        SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << file );
@@ -76,6 +78,8 @@ SGInterpTable::SGInterpTable( const std::string& file )
 // file
 SGInterpTable::SGInterpTable( const SGPath& file )
 {
+    SG_LOG( SG_MATH, SG_INFO, "Initializing Interpolator for " << file );
+
    sg_gzifstream in( file );
    if ( !in.is_open() ) {
        SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << file );
--- a/simgear/misc/CMakeLists.txt
+++ b/simgear/misc/CMakeLists.txt
@@ -19,8 +19,6 @@ set(HEADERS
    tabbed_values.hxx
    texcoord.hxx
    test_macros.hxx
-    lru_cache.hxx
-    simgear_optional.hxx
    )

 set(SOURCES
--- a/simgear/misc/CSSBorder.cxx
+++ b/simgear/misc/CSSBorder.cxx
@@ -18,6 +18,8 @@

 #include "CSSBorder.hxx"

+#include <boost/lexical_cast.hpp>
+#include <boost/range.hpp>
 #include <boost/tokenizer.hpp>

 namespace simgear
@@ -112,9 +114,9 @@ namespace simgear
          std::max
          (
            0.f,
-            std::stof
+            boost::lexical_cast<float>
            (
-              rel ? std::string(tok->begin(), tok->end() - 1)
+              rel ? boost::make_iterator_range(tok->begin(), tok->end() - 1)
                  : *tok
            )
            /
--- a/simgear/misc/ListDiff.hxx
+++ b/simgear/misc/ListDiff.hxx
@@ -21,6 +21,7 @@
 #define SG_LISTDIFF_HXX_

 #include <vector>
+#include <boost/function.hpp>

 namespace simgear
 {
@@ -29,7 +30,7 @@ namespace simgear
  struct ListDiff
  {
    typedef std::vector<T> List;
-    typedef std::function<void (T)> Callback;
+    typedef boost::function<void (T)> Callback;

    /**
     * Perform list diff in-place (modifies both lists) and call cb_add for
--- a/simgear/misc/ResourceManager.cxx
+++ b/simgear/misc/ResourceManager.cxx
@@ -49,11 +49,6 @@ ResourceManager* ResourceManager::instance()
    return static_manager;
 }    

-bool ResourceManager::haveInstance()
-{
-    return static_manager != nullptr;
-}
-
 ResourceManager::~ResourceManager()
 {
    assert(this == static_manager);
@@ -61,15 +56,6 @@ ResourceManager::~ResourceManager()
    std::for_each(_providers.begin(), _providers.end(), 
        [](ResourceProvider* p) { delete p; });
 }
-
-void ResourceManager::reset()
-{
-    if (static_manager) {
-        delete static_manager;
-        static_manager = nullptr;
-    }
-}
-
 /**
 * trivial provider using a fixed base path
 */
@@ -121,8 +107,6 @@ void ResourceManager::removeProvider(ResourceProvider* aProvider)
        SG_LOG(SG_GENERAL, SG_DEV_ALERT, "unknown provider doing remove");
        return;
    }
-
-    _providers.erase(it);
 }

 SGPath ResourceManager::findPath(const std::string& aResource, SGPath aContext)
--- a/simgear/misc/ResourceManager.hxx
+++ b/simgear/misc/ResourceManager.hxx
@@ -45,12 +45,8 @@ public:
      PRIORITY_HIGH = 1000
    } Priority;

-    static ResourceManager* instance();
-
-    static bool haveInstance();
-
-    static void reset();
-
+    static ResourceManager* instance();    
+    
    /**
     * add a simple fixed resource location, to resolve against
     */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
James Turner	1b3c048363	New version : 2018.3.4	2019-08-07 09:58:45 +01:00
Dan Wickstrom	01f689a0e4	Aircraft model reinit deletes sound effect samples, but leaves them defined in the sample group, so a reload doesn't re-add them.	2019-07-30 16:36:49 +01:00
Scott Giese	b155f2e40f	[soundmgr_openal] Pause/Resume Sound. The following changes fixes a case for me where I hear the sound change levels up and down for each pause un-pause cycle. Patch provided by daniel.c.wickstrom@gmail.com.	2019-07-30 16:36:49 +01:00
Tim Moore	10ab8b830a	nasal/lib.c: Make copy of va_list for each traversal It's not portable to traverse a va_list more than once.	2019-07-30 16:36:49 +01:00
James Turner	8a4871db83	Improve HTTP redirect handling, and add test. Ensure we get the final status code for the request after redirecting.	2019-07-30 16:36:49 +01:00
Torsten Dreyer	9a8c10cb0b	New version: 2018.3.3	2019-07-28 22:43:16 +02:00
Erik Hofman	fd32023437	Do not attempt to deregister the same emitter more than once	2019-01-26 10:17:11 +01:00
Erik Hofman	c1ee4a9172	Use AAX_PROCESSED since AAX_STOPPED is only a request to stop but the library decides when it is actually stopped. And AeonWave has become more picky about destroying emitters which aren't completely processed yet since MIDI support was added.	2019-01-26 10:16:38 +01:00
Richard Harrison	a5b32f8eb2	Fix for deleting referenced object from model registry This should have been in the previous commit - However I managed to mess up the merging of this module due to other changes related to the DDS texture cache.	2019-01-25 21:39:03 +00:00
Richard Harrison	4a86368c8f	Fix null ref during load. This happened a few times	2019-01-25 21:39:03 +00:00
Richard Harrison	3730cc48a5	Fix particles active even when disabled during load. Possibly this could be fixed better by using the plugin string data - but there is nothing that currently set this; and it seems easier to use the particle callback enabled flag.	2019-01-25 21:39:03 +00:00
Richard Harrison	8a55c2f44f	Fix for deleting still referenced object ref https://sourceforge.net/p/flightgear/codetickets/2105/ Use the thread safe versions (getRef) of the objectcache methods	2019-01-25 21:39:03 +00:00
Erik Hofman	ef1cbae22b	Split up SIMD support in ENABLE_SIMD which enables sse2 support for the compiler and ENABLE_SIMD_CODE which enables the hand crafted SIMD math functions which defaults to OFF now since compilers have catched up on generating optimized vectorized SIMD code.	2019-01-15 11:01:24 +01:00
James Turner	61f322f201	Bump patch version to 2018.3.2	2019-01-06 16:14:10 +00:00
Stuart Buchanan	becbef96f5	Fix effects for MP models - ticket 2076 https://sourceforge.net/p/flightgear/codetickets/2076/ Effects were being instantiated by the loader for all models, rather than just simple .ac/.obj models.	2018-11-06 17:44:06 +00:00
James Turner	89b3fadf0f	Fix for assert with empty systems Empty subsystem groups didn’t set their init state correctly, leading to an assert on post-init. Fix this and add a test for it. https://sourceforge.net/p/flightgear/codetickets/2043/	2018-10-23 15:30:32 +01:00
James Turner	4a1a9ea9c1	Catalogs: allow migration to alternate IDs	2018-10-17 16:24:26 +01:00
James Turner	efc609577f	Packages: check for existing update when scheduling This is fixing an issue identified in the launcher in a secondary way, to ensure if another user of the API tries to schedule an already scheduled package, we ignore the second request.	2018-10-17 16:24:20 +01:00
James Turner	6ffc501566	Mac: Set CMake OS-X deployment target correctly Also raises the OS-X min version to 10.9 for libc++ compat	2018-10-17 16:24:15 +01:00
James Turner	9785cadbd0	Fix a debug message left in the terrasync code	2018-10-05 10:41:39 +01:00