From 32125697f271ed03209f686186c67eee2075856c Mon Sep 17 00:00:00 2001 From: Jesse Beder Date: Sat, 22 Mar 2014 19:03:49 -0500 Subject: [PATCH] Rename regex.h and regex.cpp to regex_yaml, so they don't interfere with the posix variant --- src/exp.h | 2 +- src/{regex.cpp => regex_yaml.cpp} | 2 +- src/{regex.h => regex_yaml.h} | 0 src/scanscalar.h | 2 +- src/scantag.cpp | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename src/{regex.cpp => regex_yaml.cpp} (97%) rename src/{regex.h => regex_yaml.h} (100%) diff --git a/src/exp.h b/src/exp.h index 442a4a1..10eb27a 100644 --- a/src/exp.h +++ b/src/exp.h @@ -7,7 +7,7 @@ #pragma once #endif -#include "regex.h" +#include "regex_yaml.h" #include #include #include "stream.h" diff --git a/src/regex.cpp b/src/regex_yaml.cpp similarity index 97% rename from src/regex.cpp rename to src/regex_yaml.cpp index 171520a..2f17ef1 100644 --- a/src/regex.cpp +++ b/src/regex_yaml.cpp @@ -1,4 +1,4 @@ -#include "regex.h" +#include "regex_yaml.h" namespace YAML { // constructors diff --git a/src/regex.h b/src/regex_yaml.h similarity index 100% rename from src/regex.h rename to src/regex_yaml.h diff --git a/src/scanscalar.h b/src/scanscalar.h index d291110..315476d 100644 --- a/src/scanscalar.h +++ b/src/scanscalar.h @@ -8,7 +8,7 @@ #endif #include -#include "regex.h" +#include "regex_yaml.h" #include "stream.h" namespace YAML { diff --git a/src/scantag.cpp b/src/scantag.cpp index 01e6549..471ac19 100644 --- a/src/scantag.cpp +++ b/src/scantag.cpp @@ -1,5 +1,5 @@ #include "scanner.h" -#include "regex.h" +#include "regex_yaml.h" #include "exp.h" #include "yaml-cpp/exceptions.h"