X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBasics%2FBasics_Utils.hxx;h=868fd3f9a8f1222978ec3a5f0220ae0a94221891;hb=d1151f956567da46ee95cfd65502b55416145b66;hp=8a104d2a022599be31fe3a44bc6760941189beb1;hpb=bbac39ee34bd6a5e6fd051024209399b97b818b1;p=modules%2Fkernel.git diff --git a/src/Basics/Basics_Utils.hxx b/src/Basics/Basics_Utils.hxx index 8a104d2a0..868fd3f9a 100644 --- a/src/Basics/Basics_Utils.hxx +++ b/src/Basics/Basics_Utils.hxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 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 @@ -19,7 +19,7 @@ // SALOME Utils : general SALOME's definitions and tools // File : Basics_DirUtils.hxx -// Autor : Alexander A. BORODIN +// Author : Alexander A. BORODIN // Module : SALOME // #ifndef _Basics_UTILS_HXX_ @@ -32,7 +32,6 @@ #ifndef WIN32 #include #else -#include #include #pragma comment(lib,"winmm.lib") #endif @@ -61,6 +60,10 @@ namespace Kernel_Utils BASICS_EXPORT std::string GetGUID( GUIDtype ); #ifndef WIN32 BASICS_EXPORT void print_traceback(); +#else +#if (_MSC_VER >= 1400) // Visual Studio 2005 + BASICS_EXPORT int setenv(const char*, const char*, int); +#endif #endif } @@ -124,7 +127,12 @@ double ToDouble(const T &arg) { // Simple Logger macros (no dependency with SALOME) // ============================================================= // +#if defined(_DEBUG_) || defined(_DEBUG) #define STDLOG(msg) {std::cerr<